fix #25410
fix regression