diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
index e09f0937991ca537abfbc35736ef9d89aff27b2f..9d6215cc77615e82e00c636b1ca09be158d39060 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_beamformer.vhd
@@ -297,11 +297,8 @@ BEGIN
     reg_enable_mosi  => reg_stat_enable_mosi,
     reg_enable_miso  => reg_stat_enable_miso,
 
-    reg_hdr_dat_mosi  => reg_stat_hdr_dat_mosi,
-    reg_hdr_dat_miso  => reg_stat_hdr_dat_miso,
-
-    sdp_info      => sdp_info,
-    gn_index      => TO_UINT(gn_id),
+    reg_hdr_dat_mosi => reg_stat_hdr_dat_mosi,
+    reg_hdr_dat_miso => reg_stat_hdr_dat_miso,
 
     in_sosi   => bf_sum_sosi,
     out_sosi  => bst_udp_sosi,
@@ -309,7 +306,10 @@ BEGIN
 
     eth_src_mac  => stat_eth_src_mac,
     udp_src_port => stat_udp_src_port,
-    ip_src_addr  => stat_ip_src_addr
+    ip_src_addr  => stat_ip_src_addr,
+
+    sdp_info     => sdp_info,
+    gn_index     => TO_UINT(gn_id)
   );
 
   ---------------------------------------------------------------
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
index 4995e93e5b10a15a9f0b1e31c201b38ab81e0e51..aadbfee3b3af8fc6980d565c488d954dad0ec29c 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
@@ -354,17 +354,17 @@ BEGIN
     reg_hdr_dat_mosi  => reg_hdr_dat_mosi,
     reg_hdr_dat_miso  => reg_hdr_dat_miso,
 
-    sdp_info  => sdp_info,
-    gn_index  => TO_UINT(gn_id),
-    subband_calibrated_flag => subband_calibrated_flag,
-
     in_sosi   => dp_selector_out_sosi_arr(0),
     out_sosi  => sst_udp_sosi,
     out_siso  => sst_udp_siso,
 
     eth_src_mac  => eth_src_mac,
     udp_src_port => udp_src_port,
-    ip_src_addr  => ip_src_addr
+    ip_src_addr  => ip_src_addr,
+
+    gn_index                => TO_UINT(gn_id),
+    sdp_info                => sdp_info,
+    subband_calibrated_flag => subband_calibrated_flag
   );
 
 END str;