fix #25130