fix #22857