Hopefully plug memory leak