Fixed OutOfMemory-Bug