bug resulting from previous merge