fixed annoying parentheses around && within ||