Memory leak Fix