fix #22654