Fix Memmory leak