diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 3d12a96d5..f8196c223 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -617,7 +617,7 @@ static void StartExpClassic (Macro* M)
 
 	/* Read tokens for one parameter, accept empty params */
 	Last = 0;
-	while (!TokIsSep (Tok)) {
+	while (Tok != TOK_COMMA && Tok != TOK_SEP) {
 
 	    TokNode* T;