fix #25360