Fix bug from last merge