Fixed compiler warning about && within ||