Fix a logical operator inversion : && instead of ||
Merge pull request #1160 from lpefferkorn/fix_logic_error

Fix a logical operator inversion : && instead of ||