diff --git a/java_console/ui/src/main/java/com/rusefi/TriggerImage.java b/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
index c87965ae9d..49082b555e 100644
--- a/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
+++ b/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
@@ -234,7 +234,7 @@ public class TriggerImage {
 
                 int middle = WHEEL_BORDER + WHEEL_DIAMETER / 2;
                 if (showTdc) {
-                    double tdcAngle = Math.toRadians(_180 + shape.getTdcPosition());
+                    double tdcAngle = Math.toRadians(_180 + shape.getTdcPositionIn360());
 
                     int smallX = (int) (WHEEL_DIAMETER / 2 * Math.sin(tdcAngle));
                     int smallY = (int) (WHEEL_DIAMETER / 2 * Math.cos(tdcAngle));
diff --git a/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java b/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java
index 39832eccd0..f0c7bf7bdf 100644
--- a/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java
+++ b/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java
@@ -53,8 +53,8 @@ class TriggerWheelInfo {
         }
     }
 
-    public double getTdcPosition() {
-        return tdcPosition;
+    public double getTdcPositionIn360() {
+        return isFirstCrankBased() ? tdcPosition : getCompressedAngle(tdcPosition);
     }
 
     @NotNull
@@ -70,7 +70,7 @@ class TriggerWheelInfo {
     @NotNull
     private static List<TriggerSignal> compressAngle(List<TriggerSignal> wheel) {
         return wheel.stream().map(triggerSignal -> {
-            double compressAngle = getCompressedAngle(triggerSignal);
+            double compressAngle = getCompressedAngle(triggerSignal.angle);
             return new TriggerSignal(triggerSignal.waveIndex, triggerSignal.state, compressAngle);
         }).collect(Collectors.toList());
     }
@@ -78,8 +78,8 @@ class TriggerWheelInfo {
     /**
      * this is about converting 720 cycle of crank wheel shape into normal 360 circle range
      */
-    private static double getCompressedAngle(TriggerSignal triggerSignal) {
-        return triggerSignal.angle / 2;
+    private static double getCompressedAngle(double angle) {
+        return angle / 2;
     }
 
     public List<TriggerSignal> getSecondWheeTriggerSignals() {