Try to fix memory leak again (issue #3)