[chg] some bugs