Fixed OutOfMemoryError