fix #25884