fix warning about un-parenthesised && within ||