diff --git a/scorch.asm b/scorch.asm
index 1b00f7b..0504b35 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -1630,7 +1630,10 @@ noKey
 .endp
 .proc WaitOneFrame
 	lda CONSOL
-	and #%00000001 ; START KEY
+	and #%00000101	; Start + Option
+	bne @+
+	mva #$40 escFlag	
+@	and #%00000001 ; START KEY
 	beq @+
 	wait
 @	rts
diff --git a/scorch.xex b/scorch.xex
index d5614c6..58cbcb9 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/weapons.asm b/weapons.asm
index f63c326..51fc624 100644
--- a/weapons.asm
+++ b/weapons.asm
@@ -3095,7 +3095,10 @@ noBullets
 ;--------------------------------------------------
 .proc ShellDelay
     lda CONSOL
-    cmp #6
+	and #%00000101	; Start + Option
+	bne @+
+	mva #$40 escFlag	
+@	and #%00000001
     beq noShellDelay
     ldx flyDelay
 DelayLoop