memleak fix 2