diff --git a/sstv/decode.py b/sstv/decode.py
index 1c60e13..4ea4f90 100644
--- a/sstv/decode.py
+++ b/sstv/decode.py
@@ -307,8 +307,8 @@ class SSTVDecoder(object):
                              image_data[y][1][x])
                 elif self.mode.COLOR == spec.COL_FMT.YUV:
                     pixel = (image_data[y][0][x],
-                             image_data[y-odd_line][1][x],
-                             image_data[y-(odd_line-1)][1][x])
+                             image_data[y-(odd_line-1)][1][x],
+                             image_data[y-odd_line][1][x])
                 else:
                     pixel = (image_data[y][0][x],
                              image_data[y][1][x],
diff --git a/sstv/spec.py b/sstv/spec.py
index 8e512e4..2626d15 100644
--- a/sstv/spec.py
+++ b/sstv/spec.py
@@ -87,7 +87,7 @@ class R36(object):
     LINE_TIME = CHAN_OFFSETS[1] + MERGE_SCAN_TIME
     PIXEL_TIME = SCAN_TIME / LINE_WIDTH
     MERGE_PIXEL_TIME = MERGE_SCAN_TIME / LINE_WIDTH
-    WINDOW_FACTOR = 7.83
+    WINDOW_FACTOR = 7.70
 
     HAS_START_SYNC = False
     HAS_MERGE_SCAN = True