diff --git a/gateware/rtl/sysmgr_1.v b/gateware/rtl/sysmgr_1.v
index 66292bf..fe88ed6 100644
--- a/gateware/rtl/sysmgr_1.v
+++ b/gateware/rtl/sysmgr_1.v
@@ -176,8 +176,8 @@ module sysmgr (
 	// Synch triggers
 	always @(posedge clk_base)
 	begin
-		sys_start_s <= { ~sys_start_s[1] & sys_start_s[0], sys_start_s[0], sys_start };
-		sys_stop_s  <= {  ~sys_stop_s[1] &  sys_stop_s[0],  sys_stop_s[0], sys_stop  };
+		sys_start_s <= {  sys_start_s[1],                  sys_start_s[0], sys_start };
+		sys_stop_s  <= { ~sys_stop_s[1] &  sys_stop_s[0],  sys_stop_s[0],  sys_stop  };
 	end
 
 	always @(posedge clk_base)
diff --git a/gateware/rtl/sysmgr_2.v b/gateware/rtl/sysmgr_2.v
index d51e974..781c372 100644
--- a/gateware/rtl/sysmgr_2.v
+++ b/gateware/rtl/sysmgr_2.v
@@ -170,8 +170,8 @@ module sysmgr (
 	// Synch triggers
 	always @(posedge clk_base)
 	begin
-		sys_start_s <= { ~sys_start_s[1] & sys_start_s[0], sys_start_s[0], sys_start };
-		sys_stop_s  <= {  ~sys_stop_s[1] &  sys_stop_s[0],  sys_stop_s[0], sys_stop  };
+		sys_start_s <= {  sys_start_s[1],                  sys_start_s[0], sys_start };
+		sys_stop_s  <= { ~sys_stop_s[1] &  sys_stop_s[0],  sys_stop_s[0],  sys_stop  };
 	end
 
 	always @(posedge clk_base)
diff --git a/gateware/rtl/sysmgr_3.v b/gateware/rtl/sysmgr_3.v
index b3e4081..9411ade 100644
--- a/gateware/rtl/sysmgr_3.v
+++ b/gateware/rtl/sysmgr_3.v
@@ -166,8 +166,8 @@ module sysmgr (
 	// Synch triggers
 	always @(posedge clk_base)
 	begin
-		sys_start_s <= { ~sys_start_s[1] & sys_start_s[0], sys_start_s[0], sys_start };
-		sys_stop_s  <= {  ~sys_stop_s[1] &  sys_stop_s[0],  sys_stop_s[0], sys_stop  };
+		sys_start_s <= {  sys_start_s[1],                  sys_start_s[0], sys_start };
+		sys_stop_s  <= { ~sys_stop_s[1] &  sys_stop_s[0],  sys_stop_s[0],  sys_stop  };
 	end
 
 	always @(posedge clk_base)