Bug fixed : Memory Leak