diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
index fbdd90d96..1fd80de31 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
index 28c26096e..84ece725f 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
index b644bf71a..332e8c5b5 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap differ
diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
index 35ac17957..6e034bf14 100644
Binary files a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap and b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap
index cf37592f3..20872c095 100644
Binary files a/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap and b/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap differ
diff --git a/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap
index cc554953f..5b5d9079f 100644
Binary files a/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap and b/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap
index e879d113f..b3a6798e3 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap
index 7ab3781a7..28c4e5fc5 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap
index a0ea904ec..27198c7ba 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap
index 4232ccc17..1565f4808 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap differ
diff --git a/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap
index 6fd2c4cdb..798c83e35 100644
Binary files a/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap and b/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap differ
diff --git a/src/routing/aodv/test/bug-606-test-0-0.pcap b/src/routing/aodv/test/bug-606-test-0-0.pcap
index d06658134..b5ba6ac1f 100644
Binary files a/src/routing/aodv/test/bug-606-test-0-0.pcap and b/src/routing/aodv/test/bug-606-test-0-0.pcap differ
diff --git a/src/routing/aodv/test/bug-606-test-1-0.pcap b/src/routing/aodv/test/bug-606-test-1-0.pcap
index 9554a19d8..efb54fee7 100644
Binary files a/src/routing/aodv/test/bug-606-test-1-0.pcap and b/src/routing/aodv/test/bug-606-test-1-0.pcap differ
diff --git a/src/routing/aodv/test/bug-606-test-2-0.pcap b/src/routing/aodv/test/bug-606-test-2-0.pcap
index 25aded0ec..72f7eedb3 100644
Binary files a/src/routing/aodv/test/bug-606-test-2-0.pcap and b/src/routing/aodv/test/bug-606-test-2-0.pcap differ
diff --git a/src/routing/aodv/test/tcp-chain-test-0-0.pcap b/src/routing/aodv/test/tcp-chain-test-0-0.pcap
index 4c732ee2e..d700a47ce 100644
Binary files a/src/routing/aodv/test/tcp-chain-test-0-0.pcap and b/src/routing/aodv/test/tcp-chain-test-0-0.pcap differ
diff --git a/src/routing/aodv/test/tcp-chain-test-9-0.pcap b/src/routing/aodv/test/tcp-chain-test-9-0.pcap
index 731d9874c..37cf7be33 100644
Binary files a/src/routing/aodv/test/tcp-chain-test-9-0.pcap and b/src/routing/aodv/test/tcp-chain-test-9-0.pcap differ
diff --git a/src/routing/aodv/test/udp-chain-test-0-0.pcap b/src/routing/aodv/test/udp-chain-test-0-0.pcap
index 1cbecd3c7..3173db198 100644
Binary files a/src/routing/aodv/test/udp-chain-test-0-0.pcap and b/src/routing/aodv/test/udp-chain-test-0-0.pcap differ
diff --git a/src/routing/aodv/test/udp-chain-test-9-0.pcap b/src/routing/aodv/test/udp-chain-test-9-0.pcap
index 3afa2b87f..901d3a4e9 100644
Binary files a/src/routing/aodv/test/udp-chain-test-9-0.pcap and b/src/routing/aodv/test/udp-chain-test-9-0.pcap differ
diff --git a/src/routing/olsr/test/bug780-0-0.pcap b/src/routing/olsr/test/bug780-0-0.pcap
index 920b2ff82..ee570e831 100644
Binary files a/src/routing/olsr/test/bug780-0-0.pcap and b/src/routing/olsr/test/bug780-0-0.pcap differ
diff --git a/src/routing/olsr/test/bug780-1-0.pcap b/src/routing/olsr/test/bug780-1-0.pcap
index eee30b782..4b9854151 100644
Binary files a/src/routing/olsr/test/bug780-1-0.pcap and b/src/routing/olsr/test/bug780-1-0.pcap differ
diff --git a/src/simulator/time.cc b/src/simulator/time.cc
index a0af0c42d..437811cfe 100644
--- a/src/simulator/time.cc
+++ b/src/simulator/time.cc
@@ -120,14 +120,17 @@ TimeUnit<1>::TimeUnit (const std::string& s)
   iss.str (s);
   double v;
   iss >> v;
-  m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);
+  m_data = HighPrecision (v);
+  m_data.Mul (HighPrecision (TimeStepPrecision::g_tsPrecFactor, false));
 }
 
 double
 TimeUnit<1>::GetSeconds (void) const
 {
-  double timeValue = GetHighPrecision ().GetDouble ();
-  return timeValue / TimeStepPrecision::g_tsPrecFactor;
+  HighPrecision tmp = GetHighPrecision ();
+  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
+  tmp.Div (factor);
+  return tmp.GetDouble ();
 }
 
 int64_t
@@ -285,9 +288,10 @@ std::istream& operator>> (std::istream& is, Time & time)
 
 Time Seconds (double seconds)
 {
-  double d_sec = seconds * TimeStepPrecision::g_tsPrecFactor;
-  return Time (HighPrecision (d_sec));
-  //  return Time (HighPrecision ((int64_t)d_sec, false));
+  HighPrecision tmp = HighPrecision (seconds);
+  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
+  tmp.Mul (factor);
+  return Time (tmp);
 }
 
 uint64_t