Memory Leak Fixed