Memory leak not fully fixed, but much less severe now