Trying to fix memory leak
0.2.6