fix #25647
fix #25650