OutOfMemoryError fixed