Fixed mess-up from last merge