diff --git a/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx b/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx
index d4c09615ccd5c..af0e51583cab2 100644
--- a/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx
+++ b/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx
@@ -133,6 +133,7 @@ void HmpidDecoder2::init()
   for (int i = 0; i < mNumberOfEquipments; i++) {
     mTheEquipments[i]->init();
     mTheEquipments[i]->resetPadMap();
+    mTheEquipments[i]->resetErrors();
   }
 
   mDigits.clear();
@@ -1276,7 +1277,7 @@ bool HmpidDecoder2::setUpStream(void* Buffer, long BufferLen)
   }
 
   mActualStreamPtr = (uint32_t*)Buffer;                 // sets the pointer to the Buffer
-  mEndStreamPtr = ((uint32_t*)Buffer) + wordsBufferLen; // sets the End of buffer
+  mEndStreamPtr = ((uint32_t*)Buffer) + wordsBufferLen - 1; // sets the End of buffer
   mStartStreamPtr = ((uint32_t*)Buffer);
   return (true);
 }
diff --git a/Detectors/HMPID/workflow/src/DataDecoderSpec2.cxx b/Detectors/HMPID/workflow/src/DataDecoderSpec2.cxx
index 61051ab48577e..8d24cc43d8ed6 100644
--- a/Detectors/HMPID/workflow/src/DataDecoderSpec2.cxx
+++ b/Detectors/HMPID/workflow/src/DataDecoderSpec2.cxx
@@ -213,7 +213,7 @@ void DataDecoderTask2::decodeTF(framework::ProcessingContext& pc)
       // The stream end !
       LOG(debug) << "End Page decoding !";
     }
-    //   std::cout << ">>>>" << pointerToTheFirst << "," << mDeco->mDigits.size() << std::endl;
+    // std::cout << "  fDigit=" << pointerToTheFirst << " lDigit=," << mDeco->mDigits.size() << " nDigit=" << mDeco->mDigits.size()-pointerToTheFirst << std::endl;
     mTriggers.push_back(o2::hmpid::Trigger(mDeco->mIntReco, pointerToTheFirst, mDeco->mDigits.size() - pointerToTheFirst));
     mTotalFrames++;
   }