diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 3dc83082e4e..031ab624bfb 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -6920,7 +6920,7 @@ Token *Tokenizer::simplifyAddBracesToCommand(Token *tok)
             // before the "while"
             if (tokEnd) {
                 tokEnd=tokEnd->next();
-                if (!tokEnd || tokEnd->str()!="while") // no while
+                if (!Token::simpleMatch(tokEnd, "while (") || !Token::simpleMatch(tokEnd->linkAt(1), ") ;")) // no while
                     syntaxError(tok);
             }
         }
diff --git a/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d b/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d
new file mode 100644
index 00000000000..e7b11b223da
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d
@@ -0,0 +1 @@
+d o(n c){do if(c){}while(0)n}