*** fixed small bug