diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
index c42d6d76f3..d800b0ce65 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
@@ -102,6 +102,7 @@ public class ConfigDefinition {
         String cacheZipFile = null;
         String signatureDestination = null;
         String signaturePrependFile = null;
+        List<String> enumInputFiles = new ArrayList<>();
         CHeaderConsumer.withC_Defines = true;
         File[] yamlFiles = null;
 
@@ -172,10 +173,7 @@ public class ConfigDefinition {
                     signatureDestination = args[i + 1];
                     break;
                 case EnumToString.KEY_ENUM_INPUT_FILE:
-                    String inputFile = args[i + 1];
-                    // todo: 1) can we 2) should we move this relatively heavy processing after we've checked if generation is needed?
-                    state.enumsReader.process(".", inputFile);
-                    SystemOut.println(state.enumsReader.getEnums() + " total enumsReader");
+                    enumInputFiles.add(args[i + 1]);
                     break;
                 case KEY_CACHE:
                     cachePath = args[i + 1];
@@ -220,6 +218,14 @@ public class ConfigDefinition {
             return;
         }
 
+        if (!enumInputFiles.isEmpty()) {
+            for (String ef : enumInputFiles) {
+                state.enumsReader.process(".", ef);
+            }
+
+            SystemOut.println(state.enumsReader.getEnums() + " total enumsReader");
+        }
+
         long crc32 = signatureHash(tsPath, inputAllFiles);
 
         handleFiringOrder(firingEnumFileName);