diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index c37f1292c4..336e86d24c 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -104,8 +104,8 @@ class template_compile
 		$includephp_blocks = $matches[1];
 		$code = preg_replace('#<!-- INCLUDEPHP ([a-zA-Z0-9\_\-\+\./]+?) -->#', '<!-- INCLUDEPHP -->', $code);
 
-		preg_match_all('#<!-- (.*?) (.*?)?[ ]?-->#', $code, $blocks);
-		$text_blocks = preg_split('#<!-- (.*?) (.*?)?[ ]?-->#', $code);
+		preg_match_all('#<!-- ([^<!--].*?) (.*?)?[ ]?-->#', $code, $blocks);
+		$text_blocks = preg_split('#<!-- ([^<!--].*?) (.*?)?[ ]?-->#', $code);
 		
 		for ($i = 0, $j = sizeof($text_blocks); $i < $j; $i++)
 		{