Possible solution to memory leak #124

#124