fixed
Merge pull request #1386 from john-hill/out-of-memory

fixed