fix stange bug
merge