fix #22007