Still has a memory leak