fix #24145