fixed small leftover from merge