fix #23304