fixed small bug
merged with develop