diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 6bcafffaa0..f4c703748b 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1289,8 +1289,8 @@ curve = rangeMatrix, "Range Switch Input Matrix"
 		zBins = gppwm4_table
 
 	table = tcuSolenoidTableTbl,  tcuSolenoidTableMap,  "Solenoids Active By Gear",	1
-		xBins		= solenoidCountArray, tcuCurrentGear
-		yBins		= gearCountArray, tcuCurrentGear
+		xBins		= gearCountArray, tcuCurrentGear
+		yBins		= solenoidCountArray, tcuCurrentGear
 		zBins		= tcuSolenoidTable
 		xyLabels	= "Solenoid", "Gear"
 
diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
index 93ff49b7c9..fe7c33f0a2 100644
--- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
+++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
@@ -64,7 +64,7 @@ public class ConfigFieldParserTest {
 
         TestTSProjectConsumer tsProjectConsumer = new TestTSProjectConsumer("", state);
         state.readBufferedReader(test, tsProjectConsumer);
-        assertEquals("afr_type = array, S32, 0, [3x1], \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" +
+        assertEquals("afr_type = array, S32, 0, [1x3], \"ms\", 1, 0, 0, 3000, 0, noMsqSave\n" +
                 "; total TS size = 12\n", tsProjectConsumer.getContent());
     }
 
diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/TsOutput.java
index 8e890d3ba6..ea3053b237 100644
--- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/TsOutput.java
+++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/TsOutput.java
@@ -7,7 +7,11 @@ import com.rusefi.ReaderState;
 import com.rusefi.parse.Type;
 import com.rusefi.parse.TypesHelper;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import static com.rusefi.ToolUtil.EOL;
 import static com.rusefi.output.JavaSensorsConsumer.quote;
@@ -122,7 +126,9 @@ public class TsOutput {
                     tsHeader.append(" " + tsPosition + ",");
                     tsHeader.append(" [");
                     boolean first = true;
-                    for (int size : configField.getArraySizes()) {
+                    List<Integer> list = Arrays.stream(configField.getArraySizes()).boxed().collect(Collectors.toList());
+                    Collections.reverse(list);
+                    for (int size : list) {
                         if (first) {
                             first = false;
                         } else {