Memory leak issue fixed