fix #24146