memory leak fix part 2