fixed memory problem
merged