fixed a small bug
merging