fix problem with previous merge