fix #22919