Fix bug from previous merge