follow up to the previous merge commit