diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataMonAlg.cxx
index 5ad0398d1cd1814152f5acda5118a0ac22647eec..3c49e92cb134ce43ac443d5a8e4e0dd70eca8cc4 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataMonAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataMonAlg.cxx
@@ -506,8 +506,11 @@ void MMRawDataMonAlg::clusterFromTrack(const xAOD::TrackParticleContainer*  muon
 			for(const Trk::TrackStateOnSurface* trkState : *meTrack->trackStateOnSurfaces()) {
 					
 				if(!(trkState)) continue;
+				if (!trkState->type(Trk::TrackStateOnSurface::Measurement)) continue;
+
 				Identifier surfaceId = (trkState)->surface().associatedDetectorElementIdentifier();
 				if(!m_idHelperSvc->isMM(surfaceId)) continue;
+				
 				int trk_stEta = m_idHelperSvc->mmIdHelper().stationEta(surfaceId);
 				int trk_stPhi = m_idHelperSvc->mmIdHelper().stationPhi(surfaceId);
 				int trk_multi = m_idHelperSvc->mmIdHelper().multilayer(surfaceId);
@@ -552,6 +555,7 @@ void MMRawDataMonAlg::clusterFromTrack(const xAOD::TrackParticleContainer*  muon
 
 		for(const Trk::TrackStateOnSurface* trkState : *meTrack->trackStateOnSurfaces()) {
 			if(!(trkState)) continue;
+			if (!trkState->type(Trk::TrackStateOnSurface::Measurement)) continue;
 			Identifier surfaceId = (trkState)->surface().associatedDetectorElementIdentifier();
 			if(!m_idHelperSvc->isMM(surfaceId)) continue;
 			const Amg::Vector3D& pos = (trkState)->trackParameters()->position();
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataUtils.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataUtils.cxx
index a03034f3c1ed1554eaa9b9d7e228585f3309ba44..5fe7010e1e5916b6715af6d8aa6d363d4a891254 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataUtils.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/src/MMRawDataUtils.cxx
@@ -33,22 +33,22 @@ int MMRawDataMonAlg::get_PCB_from_channel(int channel) const {
 
 int MMRawDataMonAlg::get_sectorPhi_from_stationPhi_stName(int stationPhi,const std::string & stName) const {
   
-  if (stationPhi==1 && stName=="MMS") return 1;
-  if (stationPhi==1 && stName=="MML") return 2;
-  if (stationPhi==2 && stName=="MMS") return 3;
-  if (stationPhi==2 && stName=="MML") return 4;
-  if (stationPhi==3 && stName=="MMS") return 5;
-  if (stationPhi==3 && stName=="MML") return 6;
-  if (stationPhi==4 && stName=="MMS") return 7;
-  if (stationPhi==4 && stName=="MML") return 8;
-  if (stationPhi==5 && stName=="MMS") return 9;
-  if (stationPhi==5 && stName=="MML") return 10;
-  if (stationPhi==6 && stName=="MMS") return 11;
-  if (stationPhi==6 && stName=="MML") return 12;
-  if (stationPhi==7 && stName=="MMS") return 13;
-  if (stationPhi==7 && stName=="MML") return 14;
-  if (stationPhi==8 && stName=="MMS") return 15;
-  if (stationPhi==8 && stName=="MML") return 16;
+  if (stationPhi==1 && stName=="MML") return 1;
+  if (stationPhi==1 && stName=="MMS") return 2;
+  if (stationPhi==2 && stName=="MML") return 3;
+  if (stationPhi==2 && stName=="MMS") return 4;
+  if (stationPhi==3 && stName=="MML") return 5;
+  if (stationPhi==3 && stName=="MMS") return 6;
+  if (stationPhi==4 && stName=="MML") return 7;
+  if (stationPhi==4 && stName=="MMS") return 8;
+  if (stationPhi==5 && stName=="MML") return 9;
+  if (stationPhi==5 && stName=="MMS") return 10;
+  if (stationPhi==6 && stName=="MML") return 11;
+  if (stationPhi==6 && stName=="MMS") return 12;
+  if (stationPhi==7 && stName=="MML") return 13;
+  if (stationPhi==7 && stName=="MMS") return 14;
+  if (stationPhi==8 && stName=="MML") return 15;
+  if (stationPhi==8 && stName=="MMS") return 16;
 
   throw std::invalid_argument( "stationPhi and stName are not valid!" );