diff --git a/lorawan-ed-stack/Phy/region/RegionAS923.c b/lorawan-ed-stack/Phy/region/RegionAS923.c
index 9c93cda..2cbada2 100644
--- a/lorawan-ed-stack/Phy/region/RegionAS923.c
+++ b/lorawan-ed-stack/Phy/region/RegionAS923.c
@@ -704,7 +704,7 @@ bool RegionAS923TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( modem, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
 
diff --git a/lorawan-ed-stack/Phy/region/RegionAU915.c b/lorawan-ed-stack/Phy/region/RegionAU915.c
index ac2f355..4553962 100644
--- a/lorawan-ed-stack/Phy/region/RegionAU915.c
+++ b/lorawan-ed-stack/Phy/region/RegionAU915.c
@@ -690,7 +690,7 @@ bool RegionAU915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
 
-    *txTimeOnAir = GetTimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
     *txPower = txPowerLimited;
 
     LORAWAN_ED_DEBUG_LOG(LORAWAN_ED_STACK_DEBUG_PHY_REGION, DBG_LVL,"[TX INFO]: CH[%d] = %d, DR%d(SF = %d), TxPower = %d, Len = %d, ToA = %d ms",
diff --git a/lorawan-ed-stack/Phy/region/RegionCN470.c b/lorawan-ed-stack/Phy/region/RegionCN470.c
index 08f1c45..0ecffeb 100644
--- a/lorawan-ed-stack/Phy/region/RegionCN470.c
+++ b/lorawan-ed-stack/Phy/region/RegionCN470.c
@@ -595,7 +595,7 @@ bool RegionCN470TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
     *txPower = txPowerLimited;
 
     LORAWAN_ED_DEBUG_LOG(LORAWAN_ED_STACK_DEBUG_PHY_REGION, DBG_LVL,"[TX INFO]: CH[%d] = %d, DR%d(SF = %d), TxPower = %d, Len = %d, ToA = %d ms",
diff --git a/lorawan-ed-stack/Phy/region/RegionCN470S.c b/lorawan-ed-stack/Phy/region/RegionCN470S.c
index baeb479..94b33dd 100644
--- a/lorawan-ed-stack/Phy/region/RegionCN470S.c
+++ b/lorawan-ed-stack/Phy/region/RegionCN470S.c
@@ -588,7 +588,7 @@ bool RegionCN470STxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTim
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
     *txPower = txPowerLimited;
     
     LORAWAN_ED_DEBUG_LOG(LORAWAN_ED_STACK_DEBUG_PHY_REGION, DBG_LVL,"[TX INFO]: CH[%d] = %d, DR%d(SF = %d), TxPower = %d, Len = %d, ToA = %d ms",
diff --git a/lorawan-ed-stack/Phy/region/RegionCN779.c b/lorawan-ed-stack/Phy/region/RegionCN779.c
index 64bcc53..5e92319 100644
--- a/lorawan-ed-stack/Phy/region/RegionCN779.c
+++ b/lorawan-ed-stack/Phy/region/RegionCN779.c
@@ -650,7 +650,7 @@ bool RegionCN779TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( modem, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
 
diff --git a/lorawan-ed-stack/Phy/region/RegionEU433.c b/lorawan-ed-stack/Phy/region/RegionEU433.c
index 47df12d..926f76e 100644
--- a/lorawan-ed-stack/Phy/region/RegionEU433.c
+++ b/lorawan-ed-stack/Phy/region/RegionEU433.c
@@ -650,7 +650,7 @@ bool RegionEU433TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( modem, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     
diff --git a/lorawan-ed-stack/Phy/region/RegionEU868.c b/lorawan-ed-stack/Phy/region/RegionEU868.c
index 2c22ac6..fef1a55 100644
--- a/lorawan-ed-stack/Phy/region/RegionEU868.c
+++ b/lorawan-ed-stack/Phy/region/RegionEU868.c
@@ -682,7 +682,7 @@ bool RegionEU868TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( modem, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
 
diff --git a/lorawan-ed-stack/Phy/region/RegionIN865.c b/lorawan-ed-stack/Phy/region/RegionIN865.c
index adde15e..f968a2e 100644
--- a/lorawan-ed-stack/Phy/region/RegionIN865.c
+++ b/lorawan-ed-stack/Phy/region/RegionIN865.c
@@ -668,7 +668,7 @@ bool RegionIN865TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( modem, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
 
diff --git a/lorawan-ed-stack/Phy/region/RegionKR920.c b/lorawan-ed-stack/Phy/region/RegionKR920.c
index 7bc0c85..fd12be3 100644
--- a/lorawan-ed-stack/Phy/region/RegionKR920.c
+++ b/lorawan-ed-stack/Phy/region/RegionKR920.c
@@ -643,7 +643,7 @@ bool RegionKR920TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
 
diff --git a/lorawan-ed-stack/Phy/region/RegionRU864.c b/lorawan-ed-stack/Phy/region/RegionRU864.c
index 6769123..c1b44ef 100644
--- a/lorawan-ed-stack/Phy/region/RegionRU864.c
+++ b/lorawan-ed-stack/Phy/region/RegionRU864.c
@@ -644,7 +644,7 @@ bool RegionRU864TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( modem, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
 
diff --git a/lorawan-ed-stack/Phy/region/RegionUS915.c b/lorawan-ed-stack/Phy/region/RegionUS915.c
index 7f84724..6a42c81 100644
--- a/lorawan-ed-stack/Phy/region/RegionUS915.c
+++ b/lorawan-ed-stack/Phy/region/RegionUS915.c
@@ -773,7 +773,7 @@ bool RegionUS915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = GetTimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
     *txPower = txPowerLimited;
 
     LORAWAN_ED_DEBUG_LOG(LORAWAN_ED_STACK_DEBUG_PHY_REGION, DBG_LVL,"[TX INFO]: CH[%d] = %d, DR%d(SF = %d), TxPower = %d, Len = %d, ToA = %d ms",