Fixed out of memory heap space issue PDE-428