Fixed out of memory error