Small improvement, but the memory leak is still there...