diff --git a/src/Latte/Compiler/MacroTokens.php b/src/Latte/Compiler/MacroTokens.php
index 9394f84d7..f4be32c16 100644
--- a/src/Latte/Compiler/MacroTokens.php
+++ b/src/Latte/Compiler/MacroTokens.php
@@ -50,7 +50,7 @@ public function parse($s)
 			self::T_CAST => '\((?:expand|string|array|int|integer|float|bool|boolean|object)\)', // type casting
 			self::T_VARIABLE => '\$[\w\pL_]+',
 			self::T_NUMBER => '[+-]?[0-9]+(?:\.[0-9]+)?(?:e[0-9]+)?',
-			self::T_SYMBOL => '[\w\pL_]+(?:-[\w\pL_]+)*',
+			self::T_SYMBOL => '[\w\pL_]+(?:-+[\w\pL_]+)*',
 			self::T_CHAR => '::|=>|->|\+\+|--|<<|>>|<=>|<=|>=|===|!==|==|!=|<>|&&|\|\||\?\?|\?>|\*\*|\.\.\.|[^"\']', // =>, any char except quotes
 		], 'u');
 		return self::$tokenizer->tokenize($s);
diff --git a/tests/Latte/expected/macros.n-macros.html b/tests/Latte/expected/macros.n-macros.html
index 27fd4a921..0eefa7857 100644
--- a/tests/Latte/expected/macros.n-macros.html
+++ b/tests/Latte/expected/macros.n-macros.html
@@ -14,7 +14,7 @@
 <p class="foo odd">n:class</p>
 
 <p>n:class empty</p>
-
+<p class="bem--modifier">n:class with BEM</p>
 
 
 <ul title="block + if + foreach">
diff --git a/tests/Latte/expected/macros.n-macros.phtml b/tests/Latte/expected/macros.n-macros.phtml
index 0ce85c43e..923698eca 100644
--- a/tests/Latte/expected/macros.n-macros.phtml
+++ b/tests/Latte/expected/macros.n-macros.phtml
@@ -52,7 +52,7 @@ class Template%a% extends Latte\Runtime\Template
 <p<?php if ($_tmp = array_filter(['foo', (false ? 'first' : NULL), 'odd', (true ? 'foo' : 'bar')])) echo ' class="', LR\Filters::escapeHtmlAttr(implode(" ", array_unique($_tmp))), '"' ?>>n:class</p>
 
 <p<?php if ($_tmp = array_filter([false ? 'first' : NULL])) echo ' class="', LR\Filters::escapeHtmlAttr(implode(" ", array_unique($_tmp))), '"' ?>>n:class empty</p>
-
+<p<?php if ($_tmp = array_filter([true ? 'bem--modifier' : NULL])) echo ' class="', LR\Filters::escapeHtmlAttr(implode(" ", array_unique($_tmp))), '"' ?>>n:class with BEM</p>
 
 
 <?php
diff --git a/tests/Latte/templates/macros.n-macros.latte b/tests/Latte/templates/macros.n-macros.latte
index 6db4dbae2..c62200e8d 100644
--- a/tests/Latte/templates/macros.n-macros.latte
+++ b/tests/Latte/templates/macros.n-macros.latte
@@ -12,7 +12,7 @@
 <p n:class="foo, (false ? first), odd, (true ? foo : bar)">n:class</p>
 
 <p n:class="false ? first">n:class empty</p>
-
+<p n:class="true ? bem--modifier">n:class with BEM</p>
 
 
 <ul title="block + if + foreach" n:block="bl">