Fix: Memory Leak