fix regression introduced by #17155