diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index c659ca5502..04ebe8f562 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -402,7 +402,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
   }
 
 
-    if (EPC_MODE_ENABLED) {
+    if (EPC_MODE_ENABLED && get_softmodem_params()->phy_test<0) {
         if (gnb_nb > 0) {
           /*if (itti_create_task (TASK_SCTP, sctp_eNB_task, NULL) < 0) {
             LOG_E(SCTP, "Create task for SCTP failed\n");
@@ -413,6 +413,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
             LOG_E(S1AP, "Create task for S1AP failed\n");
             return -1;
           }*/
+
           if(!emulate_rf){
             if (itti_create_task (TASK_UDP, udp_eNB_task, NULL) < 0) {
               LOG_E(UDP_, "Create task for UDP failed\n");
@@ -827,7 +828,7 @@ int main( int argc, char **argv )
   }
 
   openair0_cfg[0].threequarter_fs = threequarter_fs;
-  EPC_MODE_ENABLED = !IS_SOFTMODEM_NOS1;
+  EPC_MODE_ENABLED = !IS_SOFTMODEM_NOS1; //!get_softmodem_params()->phy_test;
 
 #if T_TRACER
   T_Config_Init();
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index e71843944e..afd5404d29 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -111,8 +111,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
   msg = itti_alloc_new_message(TASK_RRC_ENB, X2AP_ENDC_SGNB_ADDITION_REQ_ACK);
   gtpv1u_enb_create_tunnel_req_t  create_tunnel_req;
   gtpv1u_enb_create_tunnel_resp_t create_tunnel_resp;
-  uint8_t inde_list[m->nb_e_rabs_tobeadded];
-  memset(inde_list, 0, m->nb_e_rabs_tobeadded*sizeof(uint8_t));
   protocol_ctxt_t ctxt;
 
 // NR RRCReconfiguration
@@ -143,6 +141,9 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
   generate_CG_Config(rrc,CG_Config,ue_context_p->ue_context.reconfig,ue_context_p->ue_context.rb_config);
 
   if(m!=NULL){
+	  uint8_t inde_list[m->nb_e_rabs_tobeadded];
+	  memset(inde_list, 0, m->nb_e_rabs_tobeadded*sizeof(uint8_t));
+
 	  if (m->nb_e_rabs_tobeadded>0){
 		  for (int i=0; i<m->nb_e_rabs_tobeadded; i++){
 			  // Add the new E-RABs at the corresponding rrc ue context of the gNB