Fix double 'or' calls