Fix after merge confusion