fix #25881