change something to make sure no momory leak

use the new code