fix #25929