diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h b/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
index f707372dfe0484951f03192700f3ebf9d90103a4..24b385ddddc0064c4e127097908bb4f48b1e2c7d 100755
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
+++ b/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
@@ -18,8 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __TRIGZFINDERINTERNAL_H__
-#define __TRIGZFINDERINTERNAL_H__
+#ifndef TRIGZFINDERINTERNAL_H
+#define TRIGZFINDERINTERNAL_H
 
 #include <cmath>
 #include <vector>
diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
index 7d831b77a8121613892ad1933782cfbae77c0090..309d83646af5c1ef37dc08d7cdc5b5cd88e8b503 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
@@ -639,7 +639,7 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
 			       zHisto[bending][bestPhi][binMax-1] ) /maxh;
 	
         /// if found a vertex flag the bins so we don't use them again 
-        if ( m_numberOfPeaks>1 ) { 
+        if ( m_numberOfPeaks>0 ) { 
           nHisto[bending][bestPhi][binMax]   = -1;
           nHisto[bending][bestPhi][binMax-1] = -1;
           nHisto[bending][bestPhi][binMax+1] = -1;
@@ -669,7 +669,7 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
 	  double significance = 0;
 	  if ( bg>0 ) { 
 	    significance = (maxh-bg)/std::sqrt(bg);
-	    if ( significance < m_minVtxSignificance ) addvtx = false;
+	    if ( significance < m_minVtxSignificance ) break; // if this vertex is not significant then no subsequent vertex could be either  
 	  }
 
 	  if ( addvtx ) {