diff --git a/pkg/exprhelpers/visitor.go b/pkg/exprhelpers/visitor.go
index 2aff560ea..cc0abe379 100644
--- a/pkg/exprhelpers/visitor.go
+++ b/pkg/exprhelpers/visitor.go
@@ -41,7 +41,6 @@ func (v *visitor) Exit(node *ast.Node) {
 			v.newVar = true
 			v.currentID = n.Value
 		} else {
-			v.newVar = false
 			fullVar := fmt.Sprintf("%s.%s", v.currentID, strings.Join(v.properties, "."))
 			v.vars = append(v.vars, fullVar)
 			v.properties = []string{}
diff --git a/pkg/leakybucket/manager_run.go b/pkg/leakybucket/manager_run.go
index 900da2769..1f6917a6d 100644
--- a/pkg/leakybucket/manager_run.go
+++ b/pkg/leakybucket/manager_run.go
@@ -159,13 +159,13 @@ func PourItemToHolders(parsed types.Event, holders []BucketFactory, buckets *Buc
 				holder.logger.Errorf("unexpected non-bool return : %T", output)
 				log.Fatalf("Filter issue")
 			}
+
+			if holder.Debug {
+				holder.ExprDebugger.Run(holder.logger, condition, exprhelpers.GetExprEnv(map[string]interface{}{"evt": &parsed}))
+			}
 			if !condition {
-				holder.logger.Debugf("eval(FALSE) %s", holder.Filter)
-				//log.Debugf("%s -> FALSE", holder.Filter)
-				//holder.logger.Debugf("Filter eval failed")
+				holder.logger.Debugf("Event leaving node : ko")
 				continue
-			} else {
-				holder.logger.Debugf("eval(TRUE) %s", holder.Filter)
 			}
 		}