Memory Leak Issue Fixed