fix #25231