Possibly fixing another memory leak