diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 68c200c5e..4babea30f 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -677,12 +677,12 @@ static void StartExpClassic (Macro* M)
     token_t     Term;
 
 
-    /* Skip the macro name */
-    NextTok ();
-
     /* Create a structure holding expansion data */
     E = NewMacExp (M);
 
+    /* Skip the macro name */
+    NextTok ();
+
     /* Read the actual parameters */
     while (!TokIsSep (CurTok.Tok)) {
 
diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak
index b82923baf..788ba8cd8 100644
--- a/src/ca65/make/gcc.mak
+++ b/src/ca65/make/gcc.mak
@@ -15,7 +15,7 @@ CA65_INC = \"/usr/lib/cc65/asminc/\"
 
 #
 CC	= gcc
-CFLAGS 	= -g -O2 -Wall -W -std=c89
+CFLAGS 	= -g -Wall -W -std=c89
 override CFLAGS += -I$(COMMON)
 override CFLAGS += -DCA65_INC=$(CA65_INC)
 EBIND	= emxbind