diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index ec8cf4911..b4155bf79 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -352,7 +352,7 @@
 
 				$pre_pos = strrpos($pre, '<');
 				$np = strpos($next,'"',strpos($next,'"')+1);
-				$next_pos = strpos(substr($next,$np), '>')+$np;
+				$next_pos = strpos(substr($next,$np), '>')+$np+1;
 
 				$tag = substr($pre, $pre_pos). substr($next, 0, $next_pos);
 				$pre = substr($pre, 0, $pre_pos);