adjust some bug