diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
index 85fd54445bb99c164afd84d70cbbad4148c97090..d7b1db48696f15a8cfc43ebcd7beb2381b95074b 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/apertif_unb1_correlator.vhd
@@ -935,19 +935,13 @@ BEGIN
   -- Workaround for simulation: the first WPFB output block is not usable! --FIXME
   -- Forward only blocks with BSN 5+
   -----------------------------------------------------------------------------
-  gen_bsn_filter : IF g_sim = TRUE GENERATE
-    p_bsn_filter : PROCESS(wpfb_snk_in_arr)
-    BEGIN
-      correlator_snk_in_arr <= (OTHERS=>c_dp_sosi_rst);
-      IF TO_UINT(wpfb_src_out_arr(0).bsn)>=5 THEN
-        correlator_snk_in_arr <= wpfb_src_out_arr;
-      END IF;
-    END PROCESS;
-  END GENERATE;
-
-  gen_connect : IF g_sim = FALSE GENERATE
-    correlator_snk_in_arr <= wpfb_src_out_arr;
-  END GENERATE;
+  p_bsn_filter : PROCESS(wpfb_snk_in_arr)
+  BEGIN
+    correlator_snk_in_arr <= (OTHERS=>c_dp_sosi_rst);
+    IF TO_UINT(wpfb_src_out_arr(0).bsn)>=5 THEN
+      correlator_snk_in_arr <= wpfb_src_out_arr;
+    END IF;
+  END PROCESS;
 
   -----------------------------------------------------------------------------
   -- Stream recorder to record the WPFB output stream to a file
@@ -957,7 +951,7 @@ BEGIN
     g_sim            => TRUE,
     g_pass_through   => FALSE,
     g_rec_not_play   => TRUE,
-    g_rec_play_file  => "../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/wpfb_src_out_arr0.rec",
+    g_rec_play_file  => "../../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/wpfb_src_out_arr0.rec",
     g_record_invalid => FALSE
   )
   PORT MAP (
@@ -1080,7 +1074,7 @@ BEGIN
       g_sim            => TRUE,
       g_pass_through   => FALSE,
       g_rec_not_play   => TRUE,
-      g_rec_play_file  => "../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/correlator_src_out_arr0.rec",
+      g_rec_play_file  => "../../../../applications/apertif/designs/apertif_unb1_correlator/tb/rec/correlator_src_out_arr0.rec",
       g_record_invalid => FALSE
     )
     PORT MAP (