diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index b3284edd41..203296bceb 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
index 87450d6672..67c13c01e7 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
@@ -22,7 +22,6 @@ public class ConfigDefinition {
     private static final String ROM_RAIDER_XML_TEMPLATE = "rusefi_template.xml";
     private static final String ROM_RAIDER_XML_OUTPUT = "rusefi.xml";
     private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h";
-    public static int totalTsSize;
 
     public static StringBuilder settingContextHelp = new StringBuilder();
 
@@ -59,10 +58,6 @@ public class ConfigDefinition {
 
         processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConsumer);
 
-
-
-        TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());
-
         state.ensureEmptyAfterProcessing();
 
         cHeader.close();
@@ -135,6 +130,7 @@ public class ConfigDefinition {
             }
         }
         cHeaderConsumer.endFile();
+        tsProjectConsumer.endFile();
         javaFieldsConcumer.endFile();
     }
 
diff --git a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
index 3140e6bb7d..cb74b0c2d0 100644
--- a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
+++ b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
@@ -12,7 +12,7 @@ public class TSProjectConsumer implements ConfigurationConsumer {
     private final CharArrayWriter tsWriter;
     private final String tsPath;
     private final ReaderState state;
-   // private int totalTsSize;
+    private int totalTsSize;
 
     public TSProjectConsumer(CharArrayWriter tsWriter, String tsPath, ReaderState state) {
         this.tsWriter = tsWriter;
@@ -20,7 +20,7 @@ public class TSProjectConsumer implements ConfigurationConsumer {
         this.state = state;
     }
 
-    static void writeTunerStudioFile(String tsPath, String fieldsSection) throws IOException {
+    private void writeTunerStudioFile(String tsPath, String fieldsSection) throws IOException {
         TsFileContent tsContent = readTsFile(tsPath);
         System.out.println("Got " + tsContent.getPrefix().length() + "/" + tsContent.getPostfix().length() + " of " + ConfigDefinition.TS_FILE_INPUT_NAME);
 
@@ -29,7 +29,7 @@ public class TSProjectConsumer implements ConfigurationConsumer {
 
         tsHeader.write("; " + CONFIG_DEFINITION_START + ConfigDefinition.EOL);
         tsHeader.write("; this section " + ConfigDefinition.MESSAGE + ConfigDefinition.EOL + ConfigDefinition.EOL);
-        tsHeader.write("pageSize            = " + ConfigDefinition.totalTsSize + ConfigDefinition.EOL);
+        tsHeader.write("pageSize            = " + totalTsSize + ConfigDefinition.EOL);
         tsHeader.write("page = 1" + ConfigDefinition.EOL);
         tsHeader.write(fieldsSection);
         if (ConfigDefinition.settingContextHelp.length() > 0) {
@@ -77,16 +77,15 @@ public class TSProjectConsumer implements ConfigurationConsumer {
 
     @Override
     public void endFile() throws IOException {
-
+        writeTunerStudioFile(tsPath, tsWriter.toString());
     }
 
     @Override
     public void handleEndStruct(ConfigStructure structure) throws IOException {
         if (state.stack.isEmpty()) {
-            ConfigDefinition.totalTsSize = structure.writeTunerStudio("", tsWriter, 0);
-            tsWriter.write("; total TS size = " + ConfigDefinition.totalTsSize + EOL);
-            VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", ConfigDefinition.totalTsSize);
- //           TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());
+            totalTsSize = structure.writeTunerStudio("", tsWriter, 0);
+            tsWriter.write("; total TS size = " + totalTsSize + EOL);
+            VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize);
         }
     }
 }