diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index bf3197b8a..2335eb738 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -717,7 +717,7 @@ static Token * createAstAtToken(Token *tok)
                 tok2 = tok2->link();
                 if (!tok2)
                     break;
-            } else if (Token::Match(tok2, "%var% %op%|(|[|.|=|:|::") || Token::Match(tok2->previous(), "[;{}] %cop%|(")) {
+            } else if (Token::Match(tok2, "%var% %op%|(|[|.|=|:|::") || Token::Match(tok2->previous(), "[(;{}] %cop%|(")) {
                 init1 = tok2;
                 std::stack<Token *> operands;
                 compileExpression(tok2, operands);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 2ddb23540..4c1653bb0 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -10291,6 +10291,7 @@ private:
         TODO_ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", "fori1=current0=,i<NUM=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)"));
         ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}"));  // it's not well-defined what this ast should be
         ASSERT_EQUALS("forab:(", testAst("for (int a : b);"));
+        ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)"));
 
         // problems with multiple expressions
         ASSERT_EQUALS("ax( whilex(", testAst("a(x) while (x)"));