Index: /trunk/FACT++/src/DataWriteFits2.cc
===================================================================
--- /trunk/FACT++/src/DataWriteFits2.cc	(revision 16096)
+++ /trunk/FACT++/src/DataWriteFits2.cc	(revision 16097)
@@ -144,7 +144,9 @@
         fFile.SetInt("DRSSTEP", GetDrsStep(), "Step of the DRS calibration");
 
-    // This is a workaround for the missing information in the event builder
-    fTstart[0] = 0;
-    fTstop[0]  = 0;
+    fTstart[0] = h.RunTime;
+    fTstart[1] = h.RunUsec;
+
+    fTstop[0] = 0;
+    fTstop[1] = 0;
 
     memset(fTriggerCounter.data(), 0, fTriggerCounter.size()*sizeof(uint32_t));
@@ -237,6 +239,4 @@
 
     memcpy(fTstop, &e.PCTime, 2*sizeof(uint32_t));
-    if (fTstart[0]==0)
-        memcpy(fTstart, fTstop, 2*sizeof(uint32_t));
 
     const int realRoiTM = (e.RoiTM > e.Roi) ? e.Roi : 0;