remove some small bug