Fixed Memory leak