diff --git a/Artix-7-HDMI-processing.xpr b/Artix-7-HDMI-processing.xpr
index dc579a2..d9b71b4 100644
--- a/Artix-7-HDMI-processing.xpr
+++ b/Artix-7-HDMI-processing.xpr
@@ -42,7 +42,7 @@
     <Option Name="IPUserFilesDir" Val="$PIPUSERFILESDIR"/>
     <Option Name="IPStaticSourceDir" Val="$PIPUSERFILESDIR/ipstatic"/>
     <Option Name="EnableBDX" Val="FALSE"/>
-    <Option Name="WTXSimLaunchSim" Val="185"/>
+    <Option Name="WTXSimLaunchSim" Val="189"/>
     <Option Name="WTModelSimLaunchSim" Val="0"/>
     <Option Name="WTQuestaLaunchSim" Val="0"/>
     <Option Name="WTIesLaunchSim" Val="0"/>
diff --git a/src/window_matcher.v b/src/window_matcher.v
index 4a73e96..863ae28 100644
--- a/src/window_matcher.v
+++ b/src/window_matcher.v
@@ -222,7 +222,7 @@ module window_matcher(
 	reg [11:0] win_vsync_ctr;
 	
 	assign win_hsync = win_hsync_int && match_locked;
-	assign win_vsync = win_vsync_int && match_locked;
+	assign win_vsync = win_vsync_int && match_locked && in_vsync;
 	always @(posedge clk) begin
 		if (rst == 1) begin
 			win_hsync_int <= 0;
@@ -244,7 +244,7 @@ module window_matcher(
 					win_hsync_ctr <= win_hsync_ctr + 1;
 				end
 				
-				if (win_hsync_ctr == win_w_int) begin
+				if (win_hsync_ctr == win_w_int || in_hsync_reg == 0) begin
 					win_hsync_int <= 0;
 					out_data_valid <= 0;
 					win_hsync_ctr <= 0;
diff --git a/window_matcher_tb_behav.wcfg b/window_matcher_tb_behav.wcfg
index 327eb6a..24ebf3b 100644
--- a/window_matcher_tb_behav.wcfg
+++ b/window_matcher_tb_behav.wcfg
@@ -11,9 +11,9 @@
       </db_ref>
    </db_ref_list>
    <zoom_setting>
-      <ZoomStartTime time="379298750fs"></ZoomStartTime>
-      <ZoomEndTime time="379559451fs"></ZoomEndTime>
-      <Cursor1Time time="379516000fs"></Cursor1Time>
+      <ZoomStartTime time="5259263400fs"></ZoomStartTime>
+      <ZoomEndTime time="5259393751fs"></ZoomEndTime>
+      <Cursor1Time time="5259364000fs"></Cursor1Time>
    </zoom_setting>
    <column_width_setting>
       <NameColumnWidth column_width="175"></NameColumnWidth>