Pulled in memory leak fix