Index: trunk/FACT++/src/ftmctrl.cc
===================================================================
--- trunk/FACT++/src/ftmctrl.cc	(revision 15184)
+++ trunk/FACT++/src/ftmctrl.cc	(revision 15185)
@@ -1268,6 +1268,9 @@
         const uint8_t state = fHeader.fState & FTM::States::kFtmStates;
 
-        if (state == fPrevState && fHeader.fTriggerCounter>=fTriggerCounter &&
-            fDynamicData.fOnTimeCounter>=fTimeStampOn)
+        const bool first = state!=fPrevState ||
+            fHeader.fTriggerCounter<fTriggerCounter ||
+            fDynamicData.fOnTimeCounter<fTimeStampOn;
+
+        if (!first)
         {
             odiff -= fTimeStampOn;
@@ -1287,5 +1290,5 @@
 
         const FTM::DimTriggerRates rates(fHeader, fDynamicData, fStaticData,
-                                         rate, tdiff*1e-6, odiff*1e-6);
+                                         first ? -1 : rate, first ? -1 : tdiff*1e-6, odiff*1e-6);
 
         fDimTriggerRates.setQuality(fHeader.fState);