Trying to fix memory leak
Fixed merged
Fixed merged