Fix problem in previous merge