fix #20880