From b9ecbbc6770e915d907df749887d511c244a1a7f Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Fri, 26 Nov 2021 09:22:16 +0000
Subject: [PATCH] Improve if condition when msg3_dcch_dtch

---
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index ec5b65e0ff..843f2368bd 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -1445,7 +1445,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
     ra->harq_pid = current_harq_pid;
 
     // Remove UE associated to TC-RNTI
-    if(harq->round==0 && ra->rnti!=tc_rnti) {
+    if(harq->round==0 && ra->msg3_dcch_dtch) {
       mac_remove_nr_ue(module_idP, tc_rnti);
     }