Potential Memory Leak Fix