chg: fix some bug