Got rid of some OutOfMemoryError