Corrected AndExpression and OrExpression