diff --git a/lib/macro.hea b/lib/macro.hea
index 79c8643..2567870 100644
--- a/lib/macro.hea
+++ b/lib/macro.hea
@@ -76,11 +76,10 @@
          .MACRO WAIT
 ;	WAIT
 ;	waits one frame (1/50 s(PAL) or 1/60s(NTSC))
-        lda CONSOL
-        cmp #6  ; START KEY
-        beq ?nowait
 ?zero	 LDA VCOUNT
 		 beq ?zero
+		 bpl ?WA
+		 sbc #10	; last lines correction
 ?WA		 cmp VCOUNT
 		 beq ?WA
 		 bcc ?WA
diff --git a/scorch.asm b/scorch.asm
index 9fb10c3..c319b30 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -1518,8 +1518,11 @@ noKey
 	rts
 .endp
 .proc WaitOneFrame
+	lda CONSOL
+	cmp #6  ; START KEY
+	beq @+
 	wait
-	rts
+@	rts
 .endp
 .proc PauseYFrames
 ; Y - number of frames to wait (divided by 2)
diff --git a/scorch.xex b/scorch.xex
index 9f7f3a7..f9a8b2e 100644
Binary files a/scorch.xex and b/scorch.xex differ