diff --git a/lodash.js b/lodash.js
index 97dacd0b4..f1e85e765 100644
--- a/lodash.js
+++ b/lodash.js
@@ -78,7 +78,7 @@
   );
 
   /** Used to match internally used tokens in template text */
-  var reToken = /__token__(\d+)/g;
+  var reToken = /__token(\d+)__/g;
 
   /** Used to match HTML characters */
   var reUnescapedHtml = /[&<>"']/g;
@@ -96,7 +96,8 @@
   var templateCounter = 0;
 
   /** Used to replace template delimiters */
-  var token = '__token__';
+  var tokenHead = '__token',
+      tokenFoot = '__';
 
   /** Used to store tokenized template text snippets */
   var tokenized = [];
@@ -840,7 +841,7 @@
     }
     var index = tokenized.length;
     tokenized[index] = "' +\n__e(" + value + ") +\n'";
-    return token + index;
+    return tokenHead + index + tokenFoot;
   }
 
   /**
@@ -858,7 +859,7 @@
     if (evaluateValue) {
       var index = tokenized.length;
       tokenized[index] = "';\n" + evaluateValue + ";\n__p += '";
-      return token + index;
+      return tokenHead + index + tokenFoot;
     }
     return escapeValue
       ? tokenizeEscape(null, escapeValue)
@@ -879,7 +880,7 @@
     }
     var index = tokenized.length;
     tokenized[index] = "' +\n((__t = (" + value + ")) == null ? '' : __t) +\n'";
-    return token + index;
+    return tokenHead + index + tokenFoot;
   }
 
   /**
diff --git a/test/test.js b/test/test.js
index 096fe966b..368abec2a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1487,6 +1487,11 @@
       }
       ok(pass);
     });
+
+    test('should tokenize delimiters correctly', function() {
+      var compiled = _.template('<span class="icon-<%= type %>2"></span>');
+      equal(compiled({ 'type': 1 }), '<span class="icon-12"></span>');
+    });
   }());
 
   /*--------------------------------------------------------------------------*/