diff --git a/openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c
index 13a2246e69..d976ec5a04 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c
@@ -259,7 +259,14 @@ uint8_t get_l0_ul(uint8_t mapping_type, uint8_t dmrs_typeA_position) {
 *********************************************************************/
 
 uint16_t get_dmrs_freq_idx_ul(uint8_t n, uint8_t k_prime, uint8_t delta, uint8_t dmrs_type) {
-  uint16_t dmrs_idx = (dmrs_type)? (6*n+k_prime+delta):((n<<2)+(k_prime<<1)+delta);
+
+  uint16_t dmrs_idx;
+
+  if (dmrs_type == pusch_dmrs_type1)
+    dmrs_idx = ((n<<2)+(k_prime<<1)+delta);
+  else
+    dmrs_idx = (6*n+k_prime+delta);
+
   return dmrs_idx;
 }
 
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 03569c232e..dabc89d35b 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -168,6 +168,7 @@ int main(int argc, char **argv) {
 
   cpuf = get_cpu_freq_GHz();
 
+
   if (load_configmodule(argc, argv) == 0) {
     exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
   }
@@ -590,7 +591,7 @@ int main(int argc, char **argv) {
   mapping_type = UE->pusch_config.pusch_TimeDomainResourceAllocation[0]->mappingType;
 
   l0 = get_l0_ul(mapping_type, 2);
-  nr_modulation(pusch_dmrs[l0][0], n_dmrs, DMRS_MOD_ORDER, mod_dmrs); // currently only codeword 0 is modulated. Qm = 2 as DMRS is QPSK modulated
+  nr_modulation(pusch_dmrs[l0][0], n_dmrs*2, DMRS_MOD_ORDER, mod_dmrs); // currently only codeword 0 is modulated. Qm = 2 as DMRS is QPSK modulated
 
 
   ///////////
@@ -606,6 +607,7 @@ int main(int argc, char **argv) {
                    available_bits/mod_order,
                    tx_layers);
 
+
   ///////////
   ////////////////////////////////////////////////////////////////////////