fix #24498