Bug Fix: Memory Leak