Fix 'or' scope to work on all classes