bug fixing
leak fix
leak fix