fix #25896