diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx
index 7690d442702adb3d00e814b8a34b9f58771a2234..954e498d03e153e8f970955ef8ed8c5048259db1 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx
@@ -41,9 +41,16 @@ StatusCode  ISF::GenParticleFinalStateFilter::initialize()
 /** returns true if the the particle is considered stable */
 #ifdef HEPMC3
 bool ISF::GenParticleFinalStateFilter::pass(HepMC::ConstGenParticlePtr particle) const
+{
+  bool passFilter = true;
+  passFilter &= isFinalState(particle);
+  passFilter &= (!m_checkGenSimStable)   || MC::isSimStable(particle);
+  passFilter &= (!m_checkGenInteracting) || MC::isSimInteracting(particle);
+  return passFilter;
+}
+
 #else
 bool ISF::GenParticleFinalStateFilter::pass(const HepMC::GenParticle& particle) const
-#endif
 {
   bool passFilter = true;
   passFilter &= isFinalState(particle);
@@ -52,6 +59,7 @@ bool ISF::GenParticleFinalStateFilter::pass(const HepMC::GenParticle& particle)
 
   return passFilter;
 }
+#endif
 
 
 StatusCode  ISF::GenParticleFinalStateFilter::finalize()
@@ -67,6 +75,7 @@ bool ISF::GenParticleFinalStateFilter::isFinalState(HepMC::ConstGenParticlePtr p
   //  * no end_vertex
   //  * status==1
   return ( !p->end_vertex() && p->status()==1 );
+}
 #else
 bool ISF::GenParticleFinalStateFilter::isFinalState(const HepMC::GenParticle &p) const {
   // particle is in its final state if both:
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx
index a589e881ac6345774877a4bfbf601a39d7449351..efee0b2b74bbc92fdc02c9532837fd07a173a282 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx
@@ -116,16 +116,16 @@ bool ISF::GenParticleGenericFilter::pass(const HepMC::GenParticle& particle) con
 /** Check whether the given particle passes all configure cuts or not */
 #ifdef HEPMC3
 bool ISF::GenParticleGenericFilter::check_cuts_passed(HepMC::ConstGenParticlePtr particle) const {
+  const auto momentum = particle->momentum();
   int pdg = particle->pdg_id();
-  const auto& momentum = particle->momentum();
 #else
 bool ISF::GenParticleGenericFilter::check_cuts_passed(const HepMC::GenParticle &particle) const {
   const auto& momentum = particle.momentum();
-  double mom = std::sqrt(momentum.x()*momentum.x()+momentum.y()*momentum.y()+momentum.z()*momentum.z());
+  int pdg = particle.pdg_id();
 #endif
+  double mom = std::sqrt(momentum.x()*momentum.x()+momentum.y()*momentum.y()+momentum.z()*momentum.z());
   double eta = momentum.eta();
   double phi = momentum.phi();
-  int pdg = particle.pdg_id();
 
   // check the particle pdg code
   if( m_pdgs.size() && std::find(std::begin(m_pdgs), std::end(m_pdgs), pdg) == std::end(m_pdgs) ) {
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx
index 987e911d67787990552853ae29324d6beb0e2dcc..c5d93d002fd25b912d1562ce5ec5bf743be0e6a0 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx
@@ -71,7 +71,7 @@ StatusCode ISF::GenParticleInteractingFilter::initialize()
 #ifdef HEPMC3
 bool ISF::GenParticleInteractingFilter::pass(HepMC::ConstGenParticlePtr particle) const
 {
-  const int pdg_id = particle.pdg_id();
+  const int pdg_id = particle->pdg_id();
   const bool isInteracting = find(m_additionalInteractingParticleTypes.begin(),
                                 m_additionalInteractingParticleTypes.end(),
                                 pdg_id) != m_additionalInteractingParticleTypes.end();