diff --git a/modules/mol/base/src/query_state.cc b/modules/mol/base/src/query_state.cc
index 64874cb82669d35f9f7b364bfec80f4c8e5c3bd1..639306c903372a4b1b49b25d4dc79d7aee5c769f 100644
--- a/modules/mol/base/src/query_state.cc
+++ b/modules/mol/base/src/query_state.cc
@@ -407,7 +407,9 @@ bool QueryState::IsAtomSelected(const AtomHandle& h)
   if(ret==false) return false;
   ret = this->EvalResidue(h.GetResidue().Impl());
   if(ret==false) return false;
-  return this->EvalAtom(h.Impl());
+  ret = this->EvalAtom(h.Impl());
+  if(ret==false) return false;
+  return true;
 }
 
 bool QueryState::IsResidueSelected(const ResidueHandle& r)