diff --git a/src/applications/onoff/onoff-application.cc b/src/applications/onoff/onoff-application.cc
index 0f1bd98b2..d3c6bf91f 100644
--- a/src/applications/onoff/onoff-application.cc
+++ b/src/applications/onoff/onoff-application.cc
@@ -165,7 +165,8 @@ void OnOffApplication::CancelEvents ()
     { // Cancel the pending send packet event
       // Calculate residual bits since last packet sent
       Time delta(Simulator::Now() - m_lastStartTime);
-      m_residualBits += (uint32_t)(m_cbrRate.GetBitRate() * delta.GetSeconds());
+      Scalar bits = delta * Scalar (m_cbrRate.GetBitRate ()) / Seconds (1.0);
+      m_residualBits += (uint32_t)bits.GetDouble ();
     }
   Simulator::Cancel(m_sendEvent);
   Simulator::Cancel(m_startStopEvent);