fix #25683