diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 8f220f1455930a0bb657bbc9e8e909f0d7b52cd3..18a0783f42c5e2bf20099dad3799d95d5e8bb465 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -505,8 +505,6 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
 //  }
   RC.gNB[Mod_id]->configured     = 1;
 
-  find_SSB_and_RO_available(Mod_id);
-
   init_symbol_rotation(fp,fp->dl_CarrierFreq);
 
   LOG_I(PHY,"gNB %d configured\n",Mod_id);
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index a1fbf2d6f00e360165c11eaf37ad48127ac8da33..5bb49070c81005c082db7ebf881ebb93d8f45260 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -352,7 +352,10 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
     phycfg.cfg->ssb_table.ssb_subcarrier_offset.tl.tag = NFAPI_NR_CONFIG_SSB_SUBCARRIER_OFFSET_TAG;
     phycfg.cfg->num_tlv++;
 
-    if (RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req) RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req(&phycfg); 
+    if (RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req) RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req(&phycfg);
+
+    find_SSB_and_RO_available(Mod_idP);
+
   }
   
   if (secondaryCellGroup) {
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 85692da2e5f731889aaa9579fe4cef8bc5084aea..f0b033a186ee7ff37f4d4ef895d089b508126c39 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -82,18 +82,18 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
     mu = scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing;
 
   get_nr_prach_info_from_index(config_index,
-                                    (int)frameP,
-                                    (int)slotP,
-                                    scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA,
-                                    mu,
-                                    cc->frame_type,
-                                    &format,
-                                    &start_symbol,
-                                    &N_t_slot,
-                                    &N_dur,
-                                    &RA_sfn_index,
-                                    &N_RA_slot,
-																		&config_period);
+			       (int)frameP,
+			       (int)slotP,
+			       scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA,
+			       mu,
+			       cc->frame_type,
+			       &format,
+			       &start_symbol,
+			       &N_t_slot,
+			       &N_dur,
+			       &RA_sfn_index,
+			       &N_RA_slot,
+			       &config_period);
   uint8_t index = 0,slot_index = 0;
 	for (slot_index = 0;slot_index < N_RA_slot; slot_index++) {
     if (N_RA_slot <= 1) { //1 PRACH slot in a subframe