fix #24305