fix #24468