diff --git a/Trigger/TrigAnalysis/TrigJiveXML/src/TrigSiSpacePointRetriever.cxx b/Trigger/TrigAnalysis/TrigJiveXML/src/TrigSiSpacePointRetriever.cxx
index 1e35fd89560d38f76fd4ad7b2a63c04504cf1c84..c42287556dbb754343892b217be39daccc0df46e 100755
--- a/Trigger/TrigAnalysis/TrigJiveXML/src/TrigSiSpacePointRetriever.cxx
+++ b/Trigger/TrigAnalysis/TrigJiveXML/src/TrigSiSpacePointRetriever.cxx
@@ -55,9 +55,9 @@ namespace JiveXML {
  
     int maxHash = m_pixelHelper->wafer_hash_max();
      for(int id=0;id<maxHash;++id){
-	    TrigSiSpacePointContainer::const_iterator spCollIt=pCont->indexFind(id);
-	    if(spCollIt==pCont->end()) continue;
-	    for(TrigSiSpacePointCollection::const_iterator spIt=(*spCollIt)->begin(); spIt!=(*spCollIt)->end();++spIt){
+	    auto spCollIt=pCont->indexFindPtr(id);
+	    if(spCollIt==nullptr) continue;
+	    for(TrigSiSpacePointCollection::const_iterator spIt=spCollIt->begin(); spIt!=spCollIt->end();++spIt){
 		x.push_back(DataType((*spIt)->x() /10.));
 		y.push_back(DataType((*spIt)->y() /10.));
 		z.push_back(DataType((*spIt)->z() /10.));
@@ -77,9 +77,9 @@ namespace JiveXML {
 
     int maxHash = m_sctHelper->wafer_hash_max();
        for(int id=0;id<maxHash;++id){
-	    TrigSiSpacePointContainer::const_iterator spCollIt=pCont->indexFind(id);
-	    if(spCollIt==pCont->end()) continue;
-	    for(TrigSiSpacePointCollection::const_iterator spIt=(*spCollIt)->begin(); spIt!=(*spCollIt)->end();++spIt){
+	    auto spCollIt=pCont->indexFindPtr(id);
+	    if(spCollIt==nullptr) continue;
+	    for(TrigSiSpacePointCollection::const_iterator spIt=spCollIt->begin(); spIt!=spCollIt->end();++spIt){
 		x.push_back(DataType((*spIt)->x() /10.));
 		y.push_back(DataType((*spIt)->y() /10.));
 		z.push_back(DataType((*spIt)->z() /10.));