memory leak fix
9 files changed