Fix regression in r2118