fix #23296