diff --git a/mustache.js b/mustache.js
index 247843e..a892a48 100644
--- a/mustache.js
+++ b/mustache.js
@@ -171,7 +171,7 @@ var Mustache = (function(undefined) {
 		}
 	}
 	
-	var default_tokenizer = /(\r?\n)|({{![\s\S]*?!}})|({{[#\^\/&{>=]?\s*\S*?\s*}?}})|({{=\S*?\s*\S*?=}})/;
+	var default_tokenizer = /(\r?\n)|({{![\s\S]*?!}})|({{[#\^\/&>]?\s*[^!{=]\S*?\s*}})|({{{\s*\S*?\s*}}})|({{=\S*?\s*\S*?=}})/;
 	function create_compiler_state(template, partials, openTag, closeTag) {
 		openTag = openTag || '{{';
 		closeTag = closeTag || '}}';
@@ -183,8 +183,16 @@ var Mustache = (function(undefined) {
 			var rOTag = escape_regex(openTag),
 				rETag = escape_regex(closeTag);
 
-			tokenizer = new RegExp('(\\r?\\n)|(' + rOTag + '![\\s\\S]*?!' + rETag + ')|(' + rOTag + '[#\^\/&{>=]?\\s*\\S*?\\s*}?' + rETag + ')|(' + rOTag + '=\\S*?\\s*\\S*?=' + rETag + ')');
+			var parts = [
+				'(\\r?\\n)' // new lines
+				, '(' + rOTag + '![\\s\\S]*?!' + rETag + ')' // comments
+				, '(' + rOTag + '[#\^\/&>]?\\s*[^!{=]\\S*?\\s*' + rETag + ')' // all other tags
+				, '(' + rOTag + '{\\s*\\S*?\\s*}' + rETag + ')' // { unescape token
+				, '(' + rOTag + '=\\S*?\\s*\\S*?=' + rETag + ')' // set delimiter change
+			];
+			tokenizer = new RegExp(parts.join('|'));
 		}
+
 	
 		var code = [];
 		var state =  {
diff --git a/test/unit.js b/test/unit.js
index 5fae8cf..64359d0 100644
--- a/test/unit.js
+++ b/test/unit.js
@@ -154,6 +154,16 @@ test("'{' or '&' (Unescaped Variable)", function() {
 		'<h1>Bear > Shark</h1>',
 		'& character'
 	);
+	
+	equals(
+		Mustache.to_html(
+			'<h1>{{title}}}</h1>',
+			{ title: 'Bear > Shark' }
+			, {}
+		),
+		'<h1>Bear &gt; Shark}</h1>'
+		, 'Potential false positive'
+	);
 });
 
 test("'#' (Sections)", function() {