Fix mega memory leak #2