FIX SOME MEMORY LEAK