diff --git a/Source/Apps/ramtest/dbgmon.asm b/Source/Apps/ramtest/dbgmon.asm
index 5fec22b8..386e31a0 100644
--- a/Source/Apps/ramtest/dbgmon.asm
+++ b/Source/Apps/ramtest/dbgmon.asm
@@ -916,8 +916,9 @@ DORAMTEST:
 	LD	A,$00			; INITIALIZE A TO 0
 
 DATABUSCHECK:
+	LD	C,A
 	LD	($0000),A		; WRITE TO LOWEST RAM ADDRESS
-	LD	C,($0000)		; READ VALUE FROM LOWEST RAM ADDRESS
+	LD	A,($0000)		; READ VALUE FROM LOWEST RAM ADDRESS
 	CP	C			; IS IT SAME AS WRITTEN?
 	JP	NZ,DATABUSFAIL		; NO? DATA BUS FAIL HANDLER ROUTINE
 	INC	A			; YES, GET NEXT VALUE
@@ -947,7 +948,8 @@ DATABUSFAIL:
 	
 ADDRBUSCHECK:
 	LD	(HL),$FF		; WRITE ALL ONES INTO HL ADDRESS
-	LD	C,($0000)		; READ VALUE FROM LOWEST RAM ADDRESS
+	LD	C,$00
+	LD	A,($0000)		; READ VALUE FROM LOWEST RAM ADDRESS
 	CP	C			; IS IT SAME AS WRITTEN?  SHOULD BE 0
 	JP	NZ,ADDRBUSFAIL		; NO? ADDR BUS FAIL HANDLER ROUTINE
 	PUSH	HL			; STORE HL, FOR COPY TO BC