Try to cut down on memory leak