diff --git a/LinkTitles.body.php b/LinkTitles.body.php
index f41c73c..c130fac 100755
--- a/LinkTitles.body.php
+++ b/LinkTitles.body.php
@@ -117,9 +117,9 @@
 
 			if ( $wgLinkTitlesSkipTemplates )
 			{
-				$templatesDelimiter = '{{.+?}}|';
+				$templatesDelimiter = '{{[^}]+}}|';
 			} else {
-				$templatesDelimiter = '{{[^|]+?}}|{{.+\||';
+				$templatesDelimiter = '{{[^|}]+}}|{{[^|]+\||';
 			};
 
 			LinkTitles::$currentTitle = $title;