diff --git a/Firmware/Driver.asm b/Firmware/Driver.asm
index 0ab7bf0..ad72a25 100644
--- a/Firmware/Driver.asm
+++ b/Firmware/Driver.asm
@@ -163,7 +163,12 @@ GetNibble:
 waitRead:
  lda InputByte
  bmi waitRead
- and #$f0 ;set all flags high
+ ora #$f0 ;set all flags high
  sta OutputByte
+ pha
+finishRead:
+ lda InputByte
+ bpl finishRead
+ pla
  rts
  
diff --git a/Firmware/Driver.lst b/Firmware/Driver.lst
index 2b7edcf..3f96359 100644
--- a/Firmware/Driver.lst
+++ b/Firmware/Driver.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - Ubuntu 2.18-1
+ca65 V2.19 - Git b22d8c74
 Main file   : Driver.asm
 Current file: Driver.asm
 
@@ -167,8 +167,13 @@ Current file: Driver.asm
 0010C8  1               waitRead:
 0010C8  1  AD DE C0      lda InputByte
 0010CB  1  30 FB         bmi waitRead
-0010CD  1  29 F0         and #$f0 ;set all flags high
+0010CD  1  09 F0         ora #$f0 ;set all flags high
 0010CF  1  8D DD C0      sta OutputByte
-0010D2  1  60            rts
-0010D3  1               
-0010D3  1               
+0010D2  1  48            pha
+0010D3  1               finishRead:
+0010D3  1  AD DE C0      lda InputByte
+0010D6  1  10 FB         bpl finishRead
+0010D8  1  68            pla
+0010D9  1  60            rts
+0010DA  1               
+0010DA  1               
diff --git a/Firmware/assemble_driver.sh b/Firmware/driver_assemble.sh
similarity index 100%
rename from Firmware/assemble_driver.sh
rename to Firmware/driver_assemble.sh
diff --git a/Firmware/assemble_test.sh b/Firmware/test_assemble.sh
similarity index 100%
rename from Firmware/assemble_test.sh
rename to Firmware/test_assemble.sh