fix #25410