2.1 Memory Leak Fixed