fix #24906