Let's fix Memory leak!!!!!!