fix #26041
fix #25580