Index: trunk/FACT++/src/Time.cc
===================================================================
--- trunk/FACT++/src/Time.cc	(revision 18444)
+++ trunk/FACT++/src/Time.cc	(revision 18445)
@@ -148,11 +148,9 @@
         mjd -= 2400000.5;
 
-    // Convert MJD to seconds since offset
+    // Convert MJD to ticks since offset
     mjd -= 40587;
-    mjd *= 24*60*60;
-
-    const double frac = fmod(mjd, 1)*pow(10, time_duration::num_fractional_digits());
-
-    *this = ptime(fUnixOffset, time_duration(0, 0, mjd, frac));
+    mjd *= 24*60*60*time_duration::ticks_per_second();
+
+    *this = ptime(fUnixOffset, time_duration(0, 0, 0, mjd));
 }
 
@@ -165,5 +163,5 @@
     const time_duration tod = time_of_day();
 
-    const double frac = tod.fractional_seconds()/pow(10, time_duration::num_fractional_digits());
+    const double frac = double(tod.fractional_seconds())/time_duration::ticks_per_second();
     const double sec  = tod.total_seconds()+frac;