Fix previous merge