Fixed regression in #16612