Fixed: Potential memory leak