fix #24412