Fixed Memory Leak Issue