MemoryLeak fixed