diff --git a/Atari/gr_basics.asm b/Atari/gr_basics.asm
index 5bd09ea..7b30739 100644
--- a/Atari/gr_basics.asm
+++ b/Atari/gr_basics.asm
@@ -646,16 +646,15 @@ EndPut4x4
     sta temp
     lda #>display
     sta temp+1
-Go
-loop  lda #$ff
-      sta (temp),y
+Go  lda #$ff
+loop  sta (temp),y
       iny
       bne @+
       inc temp+1
 @     cpy #<(display+screenheight*screenBytes+1)
       bne loop
-      lda temp+1
-      cmp #>(display+screenheight*screenBytes+1)
+      ldx temp+1
+      cpx #>(display+screenheight*screenBytes+1)
       bne loop
    rts
 .endp
diff --git a/C64/gr_basics.asm b/C64/gr_basics.asm
index a95d2f7..5750d8c 100644
--- a/C64/gr_basics.asm
+++ b/C64/gr_basics.asm
@@ -590,30 +590,20 @@ EndPut4x4
 ;--------------------------------------------------
 .proc ClearScreen
 ;--------------------------------------------------
-    mwa #displayC64 temp
-    ldy #0
-@     lda #$ff
-      sta (temp),y
-      inw temp
-      cpw temp #displayC64+screenheight*screenBytes+1
-    bne @-
-   rts
-   
     ldy #<displayC64
     lda #0
     sta temp
     lda #>displayC64
     sta temp+1
-Go
-loop  lda #$ff
-      sta (temp),y
+Go  lda #$ff
+loop  sta (temp),y
       iny
       bne @+
       inc temp+1
 @     cpy #<(displayC64+screenheight*screenBytes+1)
       bne loop
-      lda temp+1
-      cmp #>(displayC64+screenheight*screenBytes+1)
+      ldx temp+1
+      cpx #>(displayC64+screenheight*screenBytes+1)
       bne loop
    rts
 .endp
diff --git a/scorch.xex b/scorch.xex
index 0037169..ca27340 100644
Binary files a/scorch.xex and b/scorch.xex differ