diff --git a/openair1/PHY/CODING/crc_byte.c b/openair1/PHY/CODING/crc_byte.c
index b51d4b2016..652e8466b7 100644
--- a/openair1/PHY/CODING/crc_byte.c
+++ b/openair1/PHY/CODING/crc_byte.c
@@ -257,6 +257,73 @@ unsigned int crcPayload(unsigned char * inptr, int bitlen, uint32_t* crc256Table
         return crc;
 }
 
+int check_crc(uint8_t* decoded_bytes, uint32_t n, uint32_t F, uint8_t crc_type)
+{
+  uint32_t crc,oldcrc;
+  uint8_t crc_len,temp;
+
+  switch (crc_type) {
+  case CRC24_A:
+  case CRC24_B:
+    crc_len=3;
+    break;
+
+  case CRC16:
+    crc_len=2;
+    break;
+
+  case CRC8:
+    crc_len=1;
+    break;
+
+  default:
+    crc_len=3;
+  }
+
+  oldcrc= *((unsigned int *)(&decoded_bytes[(n>>3)-crc_len]));
+
+  switch (crc_type) {
+    
+  case CRC24_A:
+    oldcrc&=0x00ffffff;
+    crc = crc24a(&decoded_bytes[F>>3],
+		 n-24-F)>>8;
+    temp=((uint8_t *)&crc)[2];
+    ((uint8_t *)&crc)[2] = ((uint8_t *)&crc)[0];
+    ((uint8_t *)&crc)[0] = temp;
+    
+    break;
+    
+  case CRC24_B:
+      oldcrc&=0x00ffffff;
+      crc = crc24b(decoded_bytes,
+                   n-24)>>8;
+      temp=((uint8_t *)&crc)[2];
+      ((uint8_t *)&crc)[2] = ((uint8_t *)&crc)[0];
+      ((uint8_t *)&crc)[0] = temp;
+      
+      break;
+
+    case CRC16:
+      oldcrc&=0x0000ffff;
+      crc = crc16(decoded_bytes,
+                  n-16)>>16;
+      
+      break;
+
+    case CRC8:
+      oldcrc&=0x000000ff;
+      crc = crc8(decoded_bytes,
+                 n-8)>>24;
+      break;
+    }
+
+    if (crc == oldcrc)
+      return(1);
+    else
+      return(0);
+
+}
 
 
 #ifdef DEBUG_CRC
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index 3a0003c3ba..448c01c397 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -507,8 +507,9 @@ uint32_t  nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
 						   (int8_t*)&pl[0],
 						   llrProcBuf,
 						   p_procTime);
+
 		/*
-		if (check_crc(llrProcBuf,Kr,crc_type)) {
+		if (check_crc(llrProcBuf,Kr,harq_process->F,crc_type)) {
 		  printf("CRC OK\n");
 		  ret = 2;
 		}