OutOfMemoryException fix; ver 1.2