Fixed Memory Leak