diff --git a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
index baa1cf61f769f41d1ba89fb219aed054c0a91114..a07e672ea3a74bed7d31ac524a77de2b004f2399 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
+++ b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
@@ -528,8 +528,11 @@ void CbmMuchUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
       //}
 
       if (fMonitor) fMonitor->CountDigi(uAsicIdx, uChanInFeb);
+      //Checking for Raw channel value
+      if (usChan > 127 || usChan < 0) LOG(debug) << "ERROR !!! Channel in hit message is out of range  " << usChan;
       // uFebIdx is FEB position in the GEM and RPC
-      const uint32_t address = CreateMuchAddress(fuCurrDpbIdx, uFebIdx, uChanInFeb);
+      const uint32_t address = CreateMuchAddress(fuCurrDpbIdx, uFebIdx, usChan);
+      //const uint32_t address = CreateMuchAddress(fuCurrDpbIdx, uFebIdx, uChanInFeb);
       LOG(debug) << "Created Much Address = " << address << " from fuCurrDpbIdx " << fuCurrDpbIdx << " Feb Id "
                  << uFebIdx << " Channnel Id " << uChanInFeb;
       if (address) {
@@ -605,7 +608,7 @@ uint32_t CbmMuchUnpackAlgo::CreateMuchAddress(uint32_t dpbidx, int32_t iFebId, u
     station = 0;  // for mCBM setup
     layer   = 0;  // Station 0 for GEM-A and station 1 for Module GEM-B
   }
-  else if (dpbidx == 4 || dpbidx == 5)  //Last 2 DPBs are for GEM-2
+  else if (dpbidx == 4 || dpbidx == 5 || dpbidx == 6)  //Last 3 DPBs are for GEM-2 after 10/04/2022
   {
     station = 1;  // for mCBM setup  station
     layer   = 0;  // 0 for Module GEM-A and 1 for Module GEM-B
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
index 2f21646a58bda40b9950c3aeb33cf2cdfe29e72c..810b137774fd71b955df563e0143b43757404fde 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
+++ b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
@@ -144,7 +144,7 @@ protected:
   std::vector<FebChanMaskReco> fvChanMasks = {};
 
   /// Parameter file name
-  std::string fsParFileName = "mTofCriPar.par";
+  std::string fsParFileName = "mMuchPar.par";
 
 private:
   ClassDef(CbmMuchUnpackConfig, 2)