fix #25941