remove some bug