fix some error from last merge