fix #24288