Memory leak fix patch