missed a couple lines on previous merge