Missing a part of the previous merge