fix #24815