Fixed Memory Bug..