Added fix for OOF issue.