diff --git a/debug.c b/debug.c
index 2308d0a..3b52bc9 100644
--- a/debug.c
+++ b/debug.c
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
 
 		// we want a pulse at the falling edge
 		latch_sync = begin_hor_sync > (int)(drate * sync_tolerance * hor_sync_len) ? 1 : latch_sync;
-		int hor_sync = begin_hor_sync > (int)(drate * sync_tolerance * hor_sync_len) ? 0 : latch_sync;
+		int hor_sync = (cnt_freq > 1299.0) && latch_sync;
 		latch_sync = hor_sync ? 0 : latch_sync;
 
 		// we only want a pulse for the bits
@@ -395,13 +395,11 @@ int main(int argc, char **argv)
 			evn_count = 0;
 			odd_count = 0;
 		}
-		// TODO: need better way to compensate for pulse decay time
-		float fixme = 0.0007;
-		if (hor_ticks == (int)((fixme + sync_porch_len) * drate) ||
-			hor_ticks == (int)((fixme + sync_porch_len + y_len) * drate) ||
-			hor_ticks == (int)((fixme + sync_porch_len + y_len + seperator_len) * drate) ||
-			hor_ticks == (int)((fixme + sync_porch_len + y_len + seperator_len + porch_len) * drate) ||
-			hor_ticks == (int)((fixme + sync_porch_len + y_len + seperator_len + porch_len + uv_len) * drate)) {
+		if (hor_ticks == (int)(sync_porch_len * drate) ||
+			hor_ticks == (int)((sync_porch_len + y_len) * drate) ||
+			hor_ticks == (int)((sync_porch_len + y_len + seperator_len) * drate) ||
+			hor_ticks == (int)((sync_porch_len + y_len + seperator_len + porch_len) * drate) ||
+			hor_ticks == (int)((sync_porch_len + y_len + seperator_len + porch_len + uv_len) * drate)) {
 			uint8_t *p = img->pixel + 3 * y * width + 3 * hor_ticks;
 			p[0] = 255;
 			p[1] = 0;
diff --git a/decode.c b/decode.c
index 48785d3..62b8798 100644
--- a/decode.c
+++ b/decode.c
@@ -192,7 +192,7 @@ int decode(int *reset, struct img **img, char *img_name, float cnt_freq, float d
 
 	// we want a pulse at the falling edge
 	latch_sync = hor_ticks > (int)(drate * sync_tolerance * hor_sync_len) ? 1 : latch_sync;
-	int hor_sync = hor_ticks > (int)(drate * sync_tolerance * hor_sync_len) ? 0 : latch_sync;
+	int hor_sync = (cnt_freq > 1299.0) && latch_sync;
 	latch_sync = hor_sync ? 0 : latch_sync;
 
 	// we wait until first sync
@@ -272,12 +272,10 @@ int decode(int *reset, struct img **img, char *img_name, float cnt_freq, float d
 		odd = sep_count < 0;
 		sep_count = 0;
 	}
-	// TODO: need better way to compensate for pulse decay time
-	float fixme = 0.0007;
-	if (y_pixel_x < y_width && ticks >= (int)((fixme + sync_porch_len) * drate))
+	if (y_pixel_x < y_width && ticks >= (int)(sync_porch_len * drate))
 		y_pixel[y_pixel_x++ + (y % 2) * y_width] = fclampf(255.0 * (dat_freq - 1500.0) / 800.0, 0.0, 255.0);
 
-	if (uv_pixel_x < uv_width && ticks >= (int)((fixme + sync_porch_len + y_len + seperator_len + porch_len) * drate))
+	if (uv_pixel_x < uv_width && ticks >= (int)((sync_porch_len + y_len + seperator_len + porch_len) * drate))
 		uv_pixel[uv_pixel_x++ + odd * uv_width] = fclampf(255.0 * (dat_freq - 1500.0) / 800.0, 0.0, 255.0);
 	return 0;
 }