fix #20943