diff --git a/inc/mask.php b/inc/mask.php
index 24313de..8a13428 100755
--- a/inc/mask.php
+++ b/inc/mask.php
@@ -223,7 +223,7 @@ class Mask extends PhpObject
 	
 	private function setDefaultTagValues() {
 		$asTagNames = $this->getTags();
-		
+
 		//Default translations
 		foreach($asTagNames as $sTagName) {
 			if(self::isLangTag($sTagName)) $this->setTag($sTagName, $sTagName);
@@ -235,7 +235,7 @@ class Mask extends PhpObject
 		$asMatches = array('tag'=>array());
 		$sSafeTagMark = preg_quote(self::TAG_MARK);
 		$sSafeLangMark = preg_quote(self::LANG_PREFIX);
-		$sPattern = '/'.$sSafeTagMark.'(?P<tag>('.$sSafeLangMark.'|)\w+)'.$sSafeTagMark.'/u';
+		$sPattern = '/'.$sSafeTagMark.'(?P<tag>('.$sSafeLangMark.'|)[\w\-]+)'.$sSafeTagMark.'/u';
 		preg_match_all($sPattern, $this->sMask, $asMatches);
 		return array_unique(array_filter($asMatches['tag']));
 	}