diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx
index 7bd5275edb32db343fed39855d66f56bc108594b..996f1309c5fb971adda7f00fd6e83c4829c56cfa 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_electrons_analysis.cxx
@@ -64,7 +64,8 @@ void emcal_barrel_pions_electrons_analysis(const char* input_fname = "sim_output
     int count = 0;
     if (input[2].pdgID == 11)// Electron
     { 
-      for (const auto& i: evt && count > 1)
+      for (const auto& i: evt)
+        if (count > 0) continue;
         total_edep += i.energyDeposit;
         count++;
     }
@@ -79,7 +80,8 @@ void emcal_barrel_pions_electrons_analysis(const char* input_fname = "sim_output
     int count = 0;
     if (input[2].pdgID == -211)// Negative pion
     { 
-      for (const auto& i: evt && count < 1)
+      for (const auto& i: evt)
+        if (count > 0) continue;
         total_edep += i.energyDeposit;
         count++;
     }