memory leak issue fixed