diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/pinout/PinoutLogic.java b/java_tools/configuration_definition/src/main/java/com/rusefi/pinout/PinoutLogic.java
index f48c2a2752..5971f3c1a7 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/pinout/PinoutLogic.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/pinout/PinoutLogic.java
@@ -65,8 +65,10 @@ public class PinoutLogic {
             if (classList == null) {
                 throw new IllegalStateException(boardName + ": Class not found:  " + className + " for " + id);
             }
-            String pinType = PinType.find(className).getPinType();
-            addToPinType(boardName, enumsReader, listPin, pinType, id, className, classList);
+            PinType pinType = PinType.find(className);
+            addToPinType(boardName, enumsReader, listPin, pinType.getPinType(), id, className, classList);
+            if (pinType == PinType.EVENT_INPUTS)
+                addToPinType(boardName, enumsReader, listPin, PinType.SWITCH_INPUTS.getPinType(), id, className, classList);
         }
         for (Map.Entry<String, ArrayList<String>> kv : names.entrySet()) {
             PinType namePinType = PinType.find(kv.getKey());
diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java
index d4b099ffd3..75489f598d 100644
--- a/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java
+++ b/java_tools/configuration_definition/src/test/java/com/rusefi/pinout/PinoutLogicIntegratedTest.java
@@ -36,8 +36,8 @@ public class PinoutLogicIntegratedTest {
     public void testWholeThing() throws IOException {
         runPinoutTest("pins:\n" +
                 "  - pin: 1\n" +
-                "    id: [E11, E11]\n" +
-                "    class: [event_inputs, switch_inputs]\n" +
+                "    id: E11\n" +
+                "    class: event_inputs\n" +
                 "    function: Digital trigger/switch input for instance Hall type CAM\n" +
                 "    ts_name: Digital 2\n" +
                 "    type: din",