diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index c87d90884ea6f20956290cbae837623cef1fcc52..fa129f5ed147478f94565f2610a990a8a348246c 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -458,9 +458,9 @@ void fh_if4p5_south_in(RU_t *ru,int *frame,int *subframe) {
     symbol_mask_full = (1<<fp->symbols_per_tti)-1; 
 
   AssertFatal(proc->symbol_mask[*subframe]==0,"rx_fh_if4p5: proc->symbol_mask[%d] = %x\n",*subframe,proc->symbol_mask[*subframe]);
-  do {   // Blocking, we need a timeout on this !!!!!!!!!!!!!!!!!!!!!!!
+  do { 
     recv_IF4p5(ru, &f, &sf, &packet_type, &symbol_number);
-
+    if (oai_exit == 1) break;
     if (packet_type == IF4p5_PULFFT) proc->symbol_mask[sf] = proc->symbol_mask[sf] | (1<<symbol_number);
     else if (packet_type == IF4p5_PULTICK) {           
       if ((proc->first_rx==0) && (f!=*frame)) LOG_E(PHY,"rx_fh_if4p5: PULTICK received frame %d != expected %d\n",f,*frame);       
diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c
index ab694a11ad14a57a4856665dcdcb7c472f11d2b5..6f337fcd4f5acea22e2998cca199f8df15b63ed8 100644
--- a/targets/SIMU/USER/oaisim.c
+++ b/targets/SIMU/USER/oaisim.c
@@ -741,7 +741,7 @@ l2l1_task (void *args_p)
         while (all_done==0) {
 
           pthread_mutex_lock(&subframe_mutex);
-          int subframe_ru_mask_local = ((1<<NB_RU)-1);//subframe_ru_mask;
+          int subframe_ru_mask_local = subframe_ru_mask; //((1<<NB_RU)-1));
           int subframe_UE_mask_local  = subframe_UE_mask;
           pthread_mutex_unlock(&subframe_mutex);
           LOG_D(EMU,"Frame %d, Subframe %d, NB_RU %d, NB_UE %d: Checking masks %x,%x\n",frame,sf,NB_RU,NB_UE_INST,subframe_ru_mask_local,subframe_UE_mask_local);