diff --git a/lib/ast.js b/lib/ast.js
index f90223ec..689e956b 100644
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -904,7 +904,7 @@ TreeWalker.prototype = {
     },
     in_boolean_context: function() {
         var stack = this.stack;
-        var i = stack.length, self = stack[--i];
+        var i = stack.length, self = stack[--i].$self;
         while (i > 0) {
             var p = stack[--i];
             if ((p instanceof AST_If           && p.condition === self) ||
@@ -917,7 +917,7 @@ TreeWalker.prototype = {
             }
             if (!(p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")))
                 return false;
-            self = p;
+            self = p.$self;
         }
     },
     loopcontrol_target: function(label) {