fix #25923