fix #23515