Fix regression after merge