diff --git a/src/context-parser.js b/src/context-parser.js
index e08a809..793f151 100644
--- a/src/context-parser.js
+++ b/src/context-parser.js
@@ -180,6 +180,14 @@ FastParser.prototype.walk = function(i, input, endsWithEOF) {
             if(this.tags[0].toLowerCase() === this.tags[1].toLowerCase()) {
                 reconsume = 0;  /* see 12.2.4.13 - switch state for the following case, otherwise, reconsume. */
                 this.matchEndTagWithStartTag(symbol);
+                /* 
+                  After matchEndTagWithStartTag (with start tag name == end tag name), 
+                  the state will be transition back to DATA. 
+                  
+                  Thus we need to reset the start tag variable (tags[0]) back to nil.
+                 */
+
+                this.tags[0] = "";
             }
             break;
         case 8:  this.matchEscapedScriptTag(ch); break;
@@ -200,6 +208,7 @@ FastParser.prototype.walk = function(i, input, endsWithEOF) {
 FastParser.prototype.createStartTag = function (ch) {
     this.tagIdx = 0;
     this.tags[0] = ch;
+    this.tags[1] = '';
 };
 
 FastParser.prototype.createEndTag = function (ch) {
@@ -225,8 +234,6 @@ FastParser.prototype.matchEndTagWithStartTag = function (symbol) {
         GREATER-THAN SIGN (>): If the current end tag token is an appropriate end tag token, then switch to the data state and emit the current tag token.
                 Otherwise, treat it as per the 'anything else' entry below.
         */
-        this.tags[0] = '';
-        this.tags[1] = '';
 
         switch (symbol) {
             case stateMachine.Symbol.SPACE: /** Whitespaces */
diff --git a/tests/unit/run-functions-spec.js b/tests/unit/run-functions-spec.js
index f3b4f85..c8a234b 100644
--- a/tests/unit/run-functions-spec.js
+++ b/tests/unit/run-functions-spec.js
@@ -222,8 +222,8 @@ Authors: Nera Liu <neraliu@yahoo-inc.com>
 
                 [ { html: "<div class='classname' style='color:red'></div>",            tag0: 'div', tag1: 'div', index: 1},
                   { html: "<div class='classname' style='color:red'></div>         ",   tag0: 'div', tag1: 'div', index: 1},
-                  { html: "<div class='classname' style='color:red'></div><img>",       tag0: 'img', tag1: 'div', index: 0},
-                  { html: "<div class='classname' style='color:red'></div><img   ",     tag0: 'img', tag1: 'div', index: 0},
+                  { html: "<div class='classname' style='color:red'></div><img>",       tag0: 'img', tag1: '', index: 0},
+                  { html: "<div class='classname' style='color:red'></div><img   ",     tag0: 'img', tag1: '', index: 0},
                   { html: "<div class='classname' style='color:red'></div><img></im",   tag0: 'img', tag1: 'im',  index: 1},
                   { html: "<div class='classname' style='color:red'></div><img></img  ",tag0: 'img', tag1: 'img', index: 1},
                 ].forEach(function(testObj) {