fix small bug after merging