Fix up previous merge request