diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index ab346a8..8aabf41 100755
Binary files a/bin/driver7M5.bin and b/bin/driver7M5.bin differ
diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index 4f45654..642a299 100755
Binary files a/bin/rom8M.bin and b/bin/rom8M.bin differ
diff --git a/rdisk.c b/rdisk.c
index 4e5809f..9084f36 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -152,10 +152,8 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	// Set debug and CD-ROM disable stuff in storage struct
 	peek24L((long*)0x40851D98, c->dbgDisPos);
 	peek24L((long*)0x40851D9C, c->cdrDisPos);
-	peek24((char*)0x40851DA8, c->dbgDisByte);
-	peek24((char*)0x40851DA9, c->cdrDisByte);
-	if (dbgEN) { peek24(RDiskBuf + c->dbgDisPos, c->dbgDisByte); }
-	if (cdrEN) { peek24(RDiskBuf + c->cdrDisPos, c->cdrDisByte); }
+	peek24(dbgEN ? RDiskBuf + c->dbgDisPos : (char*)0x40851DA8, c->dbgDisByte);
+	peek24(cdrEN ? RDiskBuf + c->cdrDisPos : (char*)0x40851DA9, c->cdrDisByte);
 	
 	// If RAM disk enabled, try to allocate RAM disk buffer if not already
 	if (ramEN & !c->ramdisk) {