Finally removed memory leak?