MemLeak fixed, but one is is still there