1 files changed, 2 insertions, 2 deletions
diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java
index d77715a3e1..cc60f4c4bb 100644
--- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java
+++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java
@@ -717,8 +717,6 @@ public abstract class TreeBuilder<T> implements TokenHandler,
                     tokenizer.setState(Tokenizer.DATA);
                 }
             }
-            contextName = null;
-            contextNode = null;
         } else {
             mode = INITIAL;
             // If we are viewing XML source, put a foreign element permanently
@@ -1627,6 +1625,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
     public final void endTokenization() throws SAXException {
         formPointer = null;
         headPointer = null;
+        contextName = null;
+        contextNode = null;
         deepTreeSurrogateParent = null;
         templateModeStack = null;
         if (stack != null) {