Another memory leak fix