Fix up previous merge