fix memory leak
and one more