fix #25881
fix #25884