diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtROD_Decoder.cxx
index b5538bdf4a8bd996f52db26d6763aaaa60eaa662..3440069d82cf1e6b91de4e1547a9edb2d9701284 100755
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtROD_Decoder.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtROD_Decoder.cxx
@@ -389,7 +389,7 @@ StatusCode MdtROD_Decoder::fillCollections(const OFFLINE_FRAGMENTS_NAMESPACE::RO
         // RDO's
         while (!( (StationName == m_BMGid ? m_hptdcReadOut->is_EOT() : m_amtReadOut->is_EOT())
                || (StationName == m_BMGid ? m_hptdcReadOut->is_BOT() : m_amtReadOut->is_BOT())
-               || (StationName == m_BMGid ? 0 : m_amtReadOut->is_TWC())
+               || (StationName == m_BMGid ? m_csmReadOut->is_TWC() : m_amtReadOut->is_TWC())
                ) ) {
 
           StationName == m_BMGid ? m_hptdcReadOut->decodeWord(vint[wordPos])
@@ -480,6 +480,8 @@ StatusCode MdtROD_Decoder::fillCollections(const OFFLINE_FRAGMENTS_NAMESPACE::RO
           StationName == m_BMGid ? m_hptdcReadOut->decodeWord(vint[wordPos])
                                  : m_amtReadOut->decodeWord(vint[wordPos]);
 
+          if ( StationName == m_BMGid ) m_csmReadOut->decodeWord(vint[wordPos]);
+
         } // End of loop on AMTs