fix #25238