Fix Memory leak