diff --git a/applications/aartfaac/libraries/rsp_terminal/src/vhdl/rsp_terminal_frame_gen.vhd b/applications/aartfaac/libraries/rsp_terminal/src/vhdl/rsp_terminal_frame_gen.vhd
index 325e54ff49139f49a1fe2dc5f52e8b82ea06ddc1..a56b840c99b04f4d89d6624c5c1bfcda5cd6c12a 100644
--- a/applications/aartfaac/libraries/rsp_terminal/src/vhdl/rsp_terminal_frame_gen.vhd
+++ b/applications/aartfaac/libraries/rsp_terminal/src/vhdl/rsp_terminal_frame_gen.vhd
@@ -204,13 +204,13 @@ BEGIN
   --   sop and eop).
   -----------------------------------------------------------------------------
   u_mms_diag_block_gen : ENTITY diag_lib.mms_diag_block_gen
-  GENERIC MAP ( --FIXME: No g_blk_sync available in new mms_diag_block_gen? We need that here!
---    g_blk_sync           => TRUE,  -- use true to have LOFAR style block sync that is active from sop to eop
+  GENERIC MAP (
     g_nof_streams        => g_nof_lanes,
     g_buf_dat_w          => g_usr_dat_w,
     g_buf_addr_w         => ceil_log2(TO_UINT(g_bg_ctrl.samples_per_packet)),
     g_file_name_prefix   => g_bg_file_name_prefix,
-    g_diag_block_gen_rst => g_bg_ctrl
+    g_diag_block_gen_rst => g_bg_ctrl,
+    g_blk_sync           => TRUE -- LOFAR style block sync that is active from sop to eop
   )
   PORT MAP (
     mm_rst           => mm_rst,
diff --git a/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd b/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
index 2ad38181d7f13681d06ce4865398de664fbdef1d..1a6857d42572b1eae8ef943f0c6f3c12c0de37ca 100644
--- a/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
+++ b/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
@@ -119,7 +119,9 @@ ENTITY mms_diag_block_gen IS
     -- User input multiplexer option
     g_usr_bypass_xonoff  : BOOLEAN := FALSE;
     -- Tx_seq
-    g_seq_dat_w          : NATURAL := 32  -- >= 1, test sequence data width. Choose g_seq_dat_w <= g_buf_dat_w
+    g_seq_dat_w          : NATURAL := 32;  -- >= 1, test sequence data width. Choose g_seq_dat_w <= g_buf_dat_w
+    -- LOFAR Lofar style block sync that is active from SOP to EOP
+    g_blk_sync           : BOOLEAN := FALSE
   );
   PORT (
     -- System
@@ -153,8 +155,6 @@ ARCHITECTURE rtl OF mms_diag_block_gen IS
                                              
   CONSTANT c_post_buf_file        : STRING := ".hex";
   
-  CONSTANT c_blk_sync             : BOOLEAN := FALSE;  -- fixed use DP style of sync @ sop (no longer support Lofar style with active sync during first block)
-  
   CONSTANT c_use_mux              : BOOLEAN := g_use_usr_input AND g_use_bg;
   CONSTANT c_use_tx_seq_input     : BOOLEAN := g_use_usr_input OR g_use_bg;
   CONSTANT c_mux_nof_input        : NATURAL := 2;   -- fixed
@@ -269,7 +269,7 @@ BEGIN
       
       u_diag_block_gen : ENTITY work.diag_block_gen
       GENERIC MAP (
-        g_blk_sync   => c_blk_sync,
+        g_blk_sync   => g_blk_sync,
         g_buf_dat_w  => g_buf_dat_w, 
         g_buf_addr_w => g_buf_addr_w
       )