more leak fixing
more fix about leaking