diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index ff85d3fd75..246e0e9f3e 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -346,7 +346,11 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
 
   if (harq_process->round == 0) {
     // This is a new packet, so compute quantities regarding segmentation
-    harq_process->B = A+24;
+	if (A > 3824)
+	  harq_process->B = A+24;
+	else
+	  harq_process->B = A+16;
+
     nr_segmentation(NULL,
                     NULL,
                     harq_process->B,
@@ -495,8 +499,13 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
 
     //    printf("done\n");
     if (harq_process->C == 1){
-      crc_type = CRC24_A;
-      length_dec = harq_process->B;
+    	if (A > 3824) 
+    		crc_type = CRC24_A;
+    	else
+    		crc_type = CRC16;
+    	
+	length_dec = harq_process->B;
+
     }
     else{
       crc_type = CRC24_B;
@@ -852,7 +861,11 @@ uint32_t  nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
 
   if (harq_process->round == 0) {
       // This is a new packet, so compute quantities regarding segmentation
-      harq_process->B = A+24;
+	  if (A > 3824)
+	  	  harq_process->B = A+24;
+	  else
+	  	  harq_process->B = A+16;
+
       nr_segmentation(NULL,
                       NULL,
                       harq_process->B,
@@ -1038,7 +1051,11 @@ uint32_t  nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
 
     //    printf("done\n");
     if (harq_process->C == 1){
-      crc_type = CRC24_A;
+      if (A > 3824)
+    	crc_type = CRC24_A;
+      else
+    	crc_type = CRC16;
+
       length_dec = harq_process->B;
     }
     else{
@@ -1405,7 +1422,10 @@ void *nr_dlsch_decoding_process(void *arg)
 
   if (harq_process->round == 0) {
     // This is a new packet, so compute quantities regarding segmentation
-    harq_process->B = A+24;
+	if (A > 3824)
+	  harq_process->B = A+24;
+	else
+	  harq_process->B = A+16;
 
     nr_segmentation(NULL,
                     NULL,
@@ -1561,7 +1581,11 @@ void *nr_dlsch_decoding_process(void *arg)
     memset(harq_process->c[r],0,Kr_bytes);
 
     if (harq_process->C == 1){
-      crc_type = CRC24_A;
+    	if (A > 3824)
+    	 	crc_type = CRC24_A;
+    	else
+    		crc_type = CRC16;
+
       length_dec = harq_process->B;
     }
     else{