diff --git a/src/TTimingChargeCalibrationProcessor.cc b/src/TTimingChargeCalibrationProcessor.cc
index 47ee46c394cbbe8b55662cc8f805284ef897cf15..ac67dc7745358edcea6549ed56d5bd4fce3fe50d 100644
--- a/src/TTimingChargeCalibrationProcessor.cc
+++ b/src/TTimingChargeCalibrationProcessor.cc
@@ -117,7 +117,9 @@ void TTimingChargeCalibrationProcessor::Process()
 	 const Double_t outputT =
 	    fTimingConverterArray ? fTimingConverterArray->at(detID)->Convert(timing) : timing;
 	 ITiming *const outDataT = dynamic_cast<ITiming*>(outData);
+         TDataObject *const outDataTS = static_cast<TDataObject*>(outData);
 	 outDataT->SetTiming( outputT );
+	 outDataTS->SetTimestamp( outputT );
       }
 
       if (fInputHasCharge) {
diff --git a/src/TTimingChargeMappingProcessor.cc b/src/TTimingChargeMappingProcessor.cc
index b6e80aa5595ec50d0cae9eae1f25252053f77293..066135b84674ccb10c08d0bb14dc76b484dddb85 100644
--- a/src/TTimingChargeMappingProcessor.cc
+++ b/src/TTimingChargeMappingProcessor.cc
@@ -116,6 +116,7 @@ void TTimingChargeMappingProcessor::MapEdgedTime(const TObjArray *tArray)
 	 data->SetDetID(detID);
 	 const Double_t tLeading  = hit->GetTiming();
 	 data->SetTiming(tLeading);
+         data->SetTimestamp(tLeading);
       } else if (data) {
 	 // "Trailing" edge after "Leading" one
 	 const Double_t tLeading  = data->GetTiming();
@@ -146,6 +147,7 @@ void TTimingChargeMappingProcessor::MapTimeCharge(const TObjArray *tArray, const
       if(IsValid(data->GetDetID())) return; // take only the first hit
       data->SetDetID(detID);
       data->SetTiming(tHit->GetValue());
+      data->SetTimestamp(tHit->GetValue());
    }
 
    if(!qArray || qArray->IsEmpty()) return;
@@ -174,6 +176,7 @@ void TTimingChargeMappingProcessor::MapPairedTimeCharge(const TObjArray *tArray)
       const Double_t timing = hit->GetTiming();
       const Double_t charge = hit->GetCharge();
       data->SetTiming(timing);
+      data->SetTimestamp(timing);
       data->SetCharge(charge);
    }
 }
diff --git a/src/plastic/TTwoSidedPlasticCalibrationProcessor.cc b/src/plastic/TTwoSidedPlasticCalibrationProcessor.cc
index 00f24faaa65ac78f5130e493dba64a16a7d455b3..378e548ef9a6f2ee4b417227376ccb663b7788b1 100644
--- a/src/plastic/TTwoSidedPlasticCalibrationProcessor.cc
+++ b/src/plastic/TTwoSidedPlasticCalibrationProcessor.cc
@@ -174,6 +174,7 @@ void TTwoSidedPlasticCalibrationProcessor::ProcessByIndex()
             output->SetT1(output->GetUncheckedT1());
             output->SetT2(output->GetUncheckedT2());
 	    output->SetTiming(timing);
+	    output->SetTimestamp(timing);
 	    output->SetTDiff(tdiff);
 
 	    if (fPosConverterArray) {
@@ -286,6 +287,7 @@ void TTwoSidedPlasticCalibrationProcessor::ProcessByTimeDiff()
 	    const Double_t t2 = output->GetUncheckedT2();
 	    const Double_t timing = (t1 + t2) * 0.5;
 	    output->SetTiming(timing);
+	    output->TDataObject::SetTimestamp(timing);
 	    output->SetTDiff(tdiff);
             output->SetCharge(TMath::Sqrt(output->GetUncheckedQ1()*output->GetUncheckedQ2()));
             output->SetSide1(hit1);