Bugfix  Out of Memory Error