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 1fd80de31..fbdd90d96 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 84ece725f..28c26096e 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 332e8c5b5..b644bf71a 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 6e034bf14..35ac17957 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 20872c095..cf37592f3 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 5b5d9079f..cc554953f 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 b3a6798e3..e879d113f 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 28c4e5fc5..7ab3781a7 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 27198c7ba..a0ea904ec 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 1565f4808..4232ccc17 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 798c83e35..6fd2c4cdb 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 b5ba6ac1f..d06658134 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 efb54fee7..9554a19d8 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 72f7eedb3..25aded0ec 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 d700a47ce..4c732ee2e 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 37cf7be33..731d9874c 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 3173db198..1cbecd3c7 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 901d3a4e9..3afa2b87f 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 ee570e831..920b2ff82 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 4b9854151..eee30b782 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 437811cfe..a0af0c42d 100644
--- a/src/simulator/time.cc
+++ b/src/simulator/time.cc
@@ -120,17 +120,14 @@ TimeUnit<1>::TimeUnit (const std::string& s)
   iss.str (s);
   double v;
   iss >> v;
-  m_data = HighPrecision (v);
-  m_data.Mul (HighPrecision (TimeStepPrecision::g_tsPrecFactor, false));
+  m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);
 }
 
 double
 TimeUnit<1>::GetSeconds (void) const
 {
-  HighPrecision tmp = GetHighPrecision ();
-  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
-  tmp.Div (factor);
-  return tmp.GetDouble ();
+  double timeValue = GetHighPrecision ().GetDouble ();
+  return timeValue / TimeStepPrecision::g_tsPrecFactor;
 }
 
 int64_t
@@ -288,10 +285,9 @@ std::istream& operator>> (std::istream& is, Time & time)
 
 Time Seconds (double seconds)
 {
-  HighPrecision tmp = HighPrecision (seconds);
-  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
-  tmp.Mul (factor);
-  return Time (tmp);
+  double d_sec = seconds * TimeStepPrecision::g_tsPrecFactor;
+  return Time (HighPrecision (d_sec));
+  //  return Time (HighPrecision ((int64_t)d_sec, false));
 }
 
 uint64_t