fix #25806