diff --git a/app/src/main/java/xdsopl/robot36/Decoder.java b/app/src/main/java/xdsopl/robot36/Decoder.java
index 42c1c4d..ca550df 100644
--- a/app/src/main/java/xdsopl/robot36/Decoder.java
+++ b/app/src/main/java/xdsopl/robot36/Decoder.java
@@ -66,14 +66,17 @@ public class Decoder {
 		scanLineToleranceSamples = (int) Math.round(scanLineToleranceSeconds * sampleRate);
 		scanLineReserveSamples = sampleRate;
 		rawMode = new RawDecoder(sampleRate);
-		lastMode = rawMode;
-		lastScanLineSamples = (int) Math.round(0.150 * sampleRate);
+		Mode robot36 = new Robot_36_Color(sampleRate);
+		lastMode = robot36;
+		lastScanLineSamples = robot36.getScanLineSamples();
+		curSample = scanLineReserveSamples;
+		lastSyncPulseIndex = curSample;
 		syncPulse5msModes = new ArrayList<>();
 		syncPulse5msModes.add(RGBModes.Wraase_SC2_180(sampleRate));
 		syncPulse5msModes.add(RGBModes.Martin("1", 0.146432, sampleRate));
 		syncPulse5msModes.add(RGBModes.Martin("2", 0.073216, sampleRate));
 		syncPulse9msModes = new ArrayList<>();
-		syncPulse9msModes.add(new Robot_36_Color(sampleRate));
+		syncPulse9msModes.add(robot36);
 		syncPulse9msModes.add(new Robot_72_Color(sampleRate));
 		syncPulse9msModes.add(RGBModes.Scottie("1", 0.138240, sampleRate));
 		syncPulse9msModes.add(RGBModes.Scottie("2", 0.088064, sampleRate));