diff --git a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
index 94c9d23724..40d06996c0 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
@@ -757,10 +757,10 @@ void nr_generate_pucch2(const PHY_VARS_NR_UE *ue,
 
   for (int l=0; l<pucch_pdu->nr_of_symbols; l++) {
     // c_init calculation according to TS38.211 subclause
-    uint64_t temp_x2 = 1 << 17;
-    temp_x2 *= (14 * nr_slot_tx) + (l + startingSymbolIndex) + 1;
-    temp_x2 *= (2 * pucch_pdu->dmrs_scrambling_id) + 1;
-    x2 = (temp_x2 + (2 * pucch_pdu->dmrs_scrambling_id)) % (1U << 31);
+    uint64_t temp_x2 = 1ll << 17;
+    temp_x2 *= 14UL * nr_slot_tx + l + startingSymbolIndex + 1;
+    temp_x2 *= 2UL * pucch_pdu->dmrs_scrambling_id + 1;
+    x2 = (temp_x2 + 2UL * pucch_pdu->dmrs_scrambling_id) % (1UL << 31);
 
     int reset = 1;
     for (int ii=0; ii<=(startingPRB>>2); ii++) {