fix #24519