Try to fix memory leak