diff --git a/src/commands.c b/src/commands.c
index cad51e1..8b5acf4 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -193,6 +193,7 @@ void read_command(xmp_context handle, struct xmp_module_info *mi, struct control
 
 		ctl->classic = !ctl->classic;
 
+		/* set player flags */
 		f = xmp_get_player(handle, XMP_PLAYER_FLAGS);
 		if (ctl->classic) {
 			xmp_set_player(handle, XMP_PLAYER_FLAGS,
@@ -202,6 +203,7 @@ void read_command(xmp_context handle, struct xmp_module_info *mi, struct control
 						f &= ~XMP_FLAGS_CLASSIC);
 		}
 
+		/* set current module flags */
 		f = xmp_get_player(handle, XMP_PLAYER_CFLAGS);
 		if (ctl->classic) {
 			xmp_set_player(handle, XMP_PLAYER_CFLAGS,
diff --git a/src/main.c b/src/main.c
index 42dd6ef..d9e871d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -483,7 +483,7 @@ int main(int argc, char **argv)
 			set_flag(flags, opt.vblank, XMP_FLAGS_VBLANK);
 			set_flag(flags, opt.fx9bug, XMP_FLAGS_FX9BUG);
 			set_flag(flags, opt.fixloop, XMP_FLAGS_FIXLOOP);
-			set_flag(flags, opt.classic, XMP_FLAGS_CLASSIC);
+			set_flag(flags, control.classic, XMP_FLAGS_CLASSIC);
 			xmp_set_player(xc, XMP_PLAYER_CFLAGS, flags);
 
 			/* Show module data */