diff --git a/c64/basic/basic_commands_CD/cmd_slow.s b/c64/basic/basic_commands_CD/cmd_slow.s
index 602dd740..0a98f2c6 100644
--- a/c64/basic/basic_commands_CD/cmd_slow.s
+++ b/c64/basic/basic_commands_CD/cmd_slow.s
@@ -5,8 +5,6 @@
 
 cmd_slow:
 
-	.break
-
 #if CONFIG_MB_MEGA_65
 
 	// Command implementation for Mega65
diff --git a/c64/basic/tokenizer/tk_cut_away.s b/c64/basic/tokenizer/tk_cut_away.s
index 941a322f..c88e3c6a 100644
--- a/c64/basic/tokenizer/tk_cut_away.s
+++ b/c64/basic/tokenizer/tk_cut_away.s
@@ -8,12 +8,19 @@
 //
 
 
-tk_cut_away:
+tk_cut_away_2: // for two-bytes tokenized keywords
+
+	dec tk__len_unpacked
+
+	// FALLTROUGH
+
+tk_cut_away_1: // for single-byte tokenized keywords
+
+	dec tk__len_unpacked                         // keyword length, afterwards number of bytes to cut away
 
 	inc tk__offset
 	ldy tk__offset
 
-	dec tk__len_unpacked                         // keyword length, afterwards number of bytes to cut away
 	lda tk__len_unpacked
 	clc
 	adc tk__offset
diff --git a/c64/basic/tokenizer/tokenise_line.s b/c64/basic/tokenizer/tokenise_line.s
index 467c9c49..fc817293 100644
--- a/c64/basic/tokenizer/tokenise_line.s
+++ b/c64/basic/tokenizer/tokenise_line.s
@@ -124,7 +124,7 @@ tokenise_line_keyword_V2:
 
 	// Cut away unnecessary bytes
 
-	jsr tk_cut_away
+	jsr tk_cut_away_1
 
 	// Special handling for REM command - after this one nothing more should be tokenised
 
@@ -207,10 +207,7 @@ tokenise_line_keyword_CD:
 
 	// Cut away unnecessary bytes
 
-	inc tk__offset
-	dec tk__len_unpacked
-
-	jsr tk_cut_away
+	jsr tk_cut_away_2
 	jmp tokenise_line_loop
 
 #endif // ROM layout