Missed a line in previous merge