(fix) still fixing memory leak