fixed small bug
merge