diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 6d738dd12e..5aac54b940 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -83,7 +83,7 @@ struct_no_prefix engine_configuration_s
 #define BANKS_COUNT 2
 #define CAMS_PER_BANK 2
 
-#define CAM_INPUTS_COUNT @@BANKS_COUNT@@*@@CAMS_PER_BANK@@
+#define CAM_INPUTS_COUNT @@BANKS_COUNT@@ * @@CAMS_PER_BANK@@
 
 #define SERVO_COUNT 8
 
@@ -93,11 +93,11 @@ struct_no_prefix engine_configuration_s
 
 #define TOOTH_PACKET_COUNT 1000
 #define TOOTH_PACKET_SIZE 2
-#define TOOTH_DATA_LENGTH @@TOOTH_PACKET_SIZE@@*@@TOOTH_PACKET_COUNT@@
+#define TOOTH_DATA_LENGTH @@TOOTH_PACKET_SIZE@@ * @@TOOTH_PACKET_COUNT@@
 
 #define COMPOSITE_PACKET_COUNT 500
 #define COMPOSITE_PACKET_SIZE 5
-#define COMPOSITE_DATA_LENGTH @@COMPOSITE_PACKET_SIZE@@*@@COMPOSITE_PACKET_COUNT@@
+#define COMPOSITE_DATA_LENGTH @@COMPOSITE_PACKET_SIZE@@ * @@COMPOSITE_PACKET_COUNT@@
 #define COMPOSITE_DATA_LENGTH_HALF 1250
 
 #define MAP_ANGLE_SIZE 8
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 359f50a77c..9f956a87b3 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/ReaderState.java b/java_tools/configuration_definition/src/com/rusefi/ReaderState.java
index 708f737468..1bd53c1228 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ReaderState.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ReaderState.java
@@ -113,7 +113,7 @@ public class ReaderState {
 
         int multPosition = customSize.indexOf(MULT_TOKEN);
         if (multPosition != -1) {
-            String firstPart = customSize.substring(0, multPosition);
+            String firstPart = customSize.substring(0, multPosition).trim();
             int first;
             try {
                 first = Integer.parseInt(firstPart);
diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
index 1b3f966f6e..9ee10f3f12 100644
--- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
+++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
@@ -104,8 +104,8 @@ public class VariableRegistry  {
         value = applyVariables(value);
         int multPosition = value.indexOf(MULT_TOKEN);
         if (!isQuoted(value, '"') && multPosition != -1) {
-            Integer first = Integer.valueOf(value.substring(0, multPosition));
-            Integer second = Integer.valueOf(value.substring(multPosition + 1));
+            Integer first = Integer.valueOf(value.substring(0, multPosition).trim());
+            Integer second = Integer.valueOf(value.substring(multPosition + 1).trim());
             value = String.valueOf(first * second);
         }
 
diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java
index 3b45c65660..911e205234 100644
--- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java
+++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigFieldParserTest.java
@@ -87,7 +87,7 @@ public class ConfigFieldParserTest {
         String test = "struct pid_s\n" +
                 "#define ERROR_BUFFER_SIZE 120\n" +
                 "#define ERROR_BUFFER_COUNT 120\n" +
-                "#define RESULT @@ERROR_BUFFER_SIZE@@*@@ERROR_BUFFER_COUNT@@\n" +
+                "#define RESULT @@ERROR_BUFFER_SIZE@@ * @@ERROR_BUFFER_COUNT@@\n" +
                 "\tint16_t periodMs;PID dTime;\"ms\",      1,      0,       0, 3000,      0\n" +
                 "end_struct\n" +
                 "";