fix-memory-leak