Fix Memory leak
Fix Memory leak