fix OR operator and NOT operator