corrected a small bug resulting from the last merge