fix #25636