Possible fix for memory corruption issue.