fix #24488