diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 554002f58ed0d55d6c2080a186ccca3922f4632a..238b317ae59da3227f7d0d654b5d858203ab8751 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -950,11 +950,11 @@ void nr_generate_Msg2(module_id_t module_idP,
     nr_configure_dci(nr_mac,
                      pdcch_pdu_rel15,
                      RA_rnti,
-    	               ss,
-	                   coreset,
-	                   scc,
-	  	               bwp,
-		                 ra->beam_id,
+                     ss,
+                     coreset,
+                     scc,
+                     bwp,
+                     ra->beam_id,
                      aggregation_level,
                      CCEIndex);
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index 66766535e84de0e67861d0267b243d3e5e0a4a81..127d025417b483703bba4a28fc7a5b785e1ab55e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -410,13 +410,21 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
 
   nr_configure_pdcch(gNB_mac,
                      pdcch_pdu_rel15,
-                     SI_RNTI,
                      gNB_mac->sched_ctrlCommon->search_space,
                      gNB_mac->sched_ctrlCommon->coreset,
                      scc,
-                     bwp,
-                     gNB_mac->sched_ctrlCommon->aggregation_level,
-                     gNB_mac->sched_ctrlCommon->cce_index);
+                     bwp);
+
+  nr_configure_dci(gNB_mac,
+                   pdcch_pdu_rel15,
+                   SI_RNTI,
+                   gNB_mac->sched_ctrlCommon->search_space,
+                   gNB_mac->sched_ctrlCommon->coreset,
+                   scc,
+                   bwp,
+                   0, // beam index is not used in configure dci
+                   gNB_mac->sched_ctrlCommon->aggregation_level,
+                   gNB_mac->sched_ctrlCommon->cce_index);
 
   int dci_formats[2];
   int rnti_types[2];
@@ -504,4 +512,4 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
     gNB_mac->TX_req[CC_id].SFN = frameP;
     gNB_mac->TX_req[CC_id].Slot = slotP;
   }
-}
\ No newline at end of file
+}
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 5ece41ab6022daf3fa0aa7e9de63a00531c0af65..63000704629b9a73695ae02be511437a2a28be70 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -506,6 +506,7 @@ void nr_configure_dci(gNB_MAC_INST *nr_mac,
      		      uint8_t beam_index,
                       uint8_t aggregation_level,
                       int CCEIndex) {
+
   pdcch_pdu->dci_pdu.RNTI[pdcch_pdu->numDlDci]=rnti;
 
   if (coreset->pdcch_DMRS_ScramblingID != NULL &&
@@ -701,7 +702,7 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
                    sched_ctrl->coreset,
                    scc,
                    bwp,
-	           UE_beam_index,
+                   UE_beam_index,
                    sched_ctrl->aggregation_level,
                    sched_ctrl->cce_index);
   pdcch_pdu_rel15->numDlDci++;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index ce21874b1b8a04e419dfc175b7e601e8a848960c..53ec4e9d82f0b8c9a1944aedeac04bfd4ba7b334 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -787,9 +787,10 @@ void nr_schedule_ulsch(module_id_t module_id,
                      sched_ctrl->coreset,
                      scc,
                      sched_ctrl->active_bwp,
-	                   UE_info->UE_beam_index[UE_id],
+                     UE_info->UE_beam_index[UE_id],
                      sched_ctrl->aggregation_level,
                      sched_ctrl->cce_index);
+
     pdcch_pdu_rel15->numDlDci++;
 
     dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET];