fix #25148