diff --git a/earthdiagnostics/data_convention.py b/earthdiagnostics/data_convention.py
index e618aa1960b1b4caf4740da37e8d3a3bfab3069d..d21a29567a7d11a3380fe1daf66ef185fe238c7e 100644
--- a/earthdiagnostics/data_convention.py
+++ b/earthdiagnostics/data_convention.py
@@ -422,10 +422,11 @@ class DataConvention(object):
             var_path = self.get_file_path(
                 startdate, member, domain, var, cmor_var, chunk, frequency=freq
             )
-            if os.path.isfile(var_path):
-                current_count += 1
-                if current_count >= self.config.cmor.min_cmorized_vars:
-                    break
+            for path in (var_path, var_path.replace('/original_files/', '/')):
+                if os.path.isfile(path):
+                    current_count += 1
+                    if current_count >= self.config.cmor.min_cmorized_vars:
+                        break
         return current_count
 
     def is_cmorized(self, startdate, member, chunk, domain):
@@ -985,7 +986,9 @@ class Cmor3Convention(DataConvention):
         """
         startdate_path = self.get_startdate_path(startdate)
         if not os.path.isdir(startdate_path):
-            return False
+            startdate_path = startdate_path.replace('/original_files/', '/')
+            if not os.path.isdir(startdate_path):
+                return False
         count = 0
         member_path = os.path.join(startdate_path, self.get_member_str(member))
         if not os.path.isdir(member_path):