fix #22518 again