Memory Leak solved