Fix bug introduced in previous merge