diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
index 8fc5919a14..bcf76f7143 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
@@ -140,12 +140,15 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
 
     @NotNull
     public String getComleteGetterBody() {
-        StringBuilder getterBody = new StringBuilder();
-        for (Pair<String, String> pair : getterPairs) {
-            getterBody.append(getCompareName(pair.first));
-            getterBody.append("\t\treturn " + pair.second + ";\n");
-        }
-        return GET_METHOD_HEADER + getterBody + GET_METHOD_FOOTER;
+        StringBuilder switchBody = new StringBuilder();
+
+        StringBuilder getterBody = GetOutputValueConsumer.getGetters(switchBody, getterPairs);
+
+        String fullSwitch = GetOutputValueConsumer.wrapSwitchStatement(switchBody);
+
+        return GET_METHOD_HEADER +
+                fullSwitch +
+                getterBody + GET_METHOD_FOOTER;
     }
 
     @NotNull
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java
index 9c8ea845b1..18de742d14 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java
@@ -64,19 +64,23 @@ public class GetOutputValueConsumer implements ConfigurationConsumer {
 
         StringBuilder getterBody = getGetters(switchBody, getterPairs);
 
-        String fullSwitch = switchBody.length() == 0 ? "" :
-                ("\tint hash = djb2lowerCase(name);\n" +
-
-                        "\tswitch(hash) {\n" + switchBody + "\t}\n");
+        String fullSwitch = wrapSwitchStatement(switchBody);
 
         return FILE_HEADER +
                 "float getOutputValueByName(const char *name) {\n" +
                 fullSwitch +
-
-
                 getterBody + GetConfigValueConsumer.GET_METHOD_FOOTER;
     }
 
+    @NotNull
+    static String wrapSwitchStatement(StringBuilder switchBody) {
+        String fullSwitch = switchBody.length() == 0 ? "" :
+                ("\tint hash = djb2lowerCase(name);\n" +
+
+                        "\tswitch(hash) {\n" + switchBody + "\t}\n");
+        return fullSwitch;
+    }
+
     @NotNull
     static StringBuilder getGetters(StringBuilder switchBody, List<Pair<String, String>> getterPairs1) {
         HashMap<Integer, AtomicInteger> hashConflicts = getHashConflicts(getterPairs1);
diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
index 0002f20c42..5dec6fc92a 100644
--- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
+++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
@@ -5,8 +5,6 @@ import com.rusefi.ReaderState;
 import com.rusefi.output.GetConfigValueConsumer;
 import org.junit.Test;
 
-import java.io.IOException;
-
 import static org.junit.Assert.assertEquals;
 
 public class GetConfigValueConsumerTest {
@@ -78,8 +76,11 @@ public class GetConfigValueConsumerTest {
                 "\t\t\treturn *(float*)hackEngineConfigurationPointer(known->value);\n" +
                 "\t\t}\n" +
                 "\t}\n" +
-                "\tif (strEqualCaseInsensitive(name, \"iat.adcChannel\"))\n" +
-                "\t\treturn config->iat.adcChannel;\n" +
+                "\tint hash = djb2lowerCase(name);\n" +
+                "\tswitch(hash) {\n" +
+                "\t\tcase -1237776078:\n" +
+                "\t\t\treturn config->iat.adcChannel;\n" +
+                "\t}\n" +
                 "\treturn EFI_ERROR_CODE;\n" +
                 "}\n", getConfigValueConsumer.getComleteGetterBody());
     }
@@ -166,24 +167,27 @@ public class GetConfigValueConsumerTest {
                 "\t\t\treturn *(float*)hackEngineConfigurationPointer(known->value);\n" +
                 "\t\t}\n" +
                 "\t}\n" +
-                "\tif (strEqualCaseInsensitive(name, \"clt.config.map.sensor.hwChannel\"))\n" +
-                "\t\treturn config->clt.config.map.sensor.hwChannel;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"clt.adcChannel\"))\n" +
-                "\t\treturn config->clt.adcChannel;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"issue_294_31\"))\n" +
-                "\t\treturn config->issue_294_31;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"baseFuel\"))\n" +
-                "\t\treturn config->baseFuel;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"speedToRpmRatio\"))\n" +
-                "\t\treturn config->speedToRpmRatio;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"afr_typet\"))\n" +
-                "\t\treturn config->afr_typet;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"vehicleSpeedKph\"))\n" +
-                "\t\treturn config->vehicleSpeedKph;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"isForcedInduction\"))\n" +
-                "\t\treturn config->isForcedInduction;\n" +
-                "\tif (strEqualCaseInsensitive(name, \"enableFan1WithAc\"))\n" +
-                "\t\treturn config->enableFan1WithAc;\n" +
+                "\tint hash = djb2lowerCase(name);\n" +
+                "\tswitch(hash) {\n" +
+                "\t\tcase 581685574:\n" +
+                "\t\t\treturn config->clt.config.map.sensor.hwChannel;\n" +
+                "\t\tcase -1144186889:\n" +
+                "\t\t\treturn config->clt.adcChannel;\n" +
+                "\t\tcase -1571463185:\n" +
+                "\t\t\treturn config->issue_294_31;\n" +
+                "\t\tcase 727098956:\n" +
+                "\t\t\treturn config->baseFuel;\n" +
+                "\t\tcase -685727673:\n" +
+                "\t\t\treturn config->speedToRpmRatio;\n" +
+                "\t\tcase 1694412179:\n" +
+                "\t\t\treturn config->afr_typet;\n" +
+                "\t\tcase -1925174695:\n" +
+                "\t\t\treturn config->vehicleSpeedKph;\n" +
+                "\t\tcase -617915487:\n" +
+                "\t\t\treturn config->isForcedInduction;\n" +
+                "\t\tcase -298185774:\n" +
+                "\t\t\treturn config->enableFan1WithAc;\n" +
+                "\t}\n" +
                 "\treturn EFI_ERROR_CODE;\n" +
                 "}\n", getConfigValueConsumer.getHeaderAndGetter());
     }