fixed memory issue...