fix #24138