fix: construct a and-or clause instead of an and-and clause;

fix: construct a and-or clause instead of an and-and clause; #6639