diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 3169899d..f7b22071 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -776,8 +776,8 @@ HB_START:
 
 	; SET DEFAULT CPU CLOCK MULTIPLIERS (XTAL / 2)
 	XOR	A
-	OUT0	(Z180_CCR),A
 	OUT0	(Z180_CMR),A
+	OUT0	(Z180_CCR),A
 
 	; SET DEFAULT WAIT STATES
 	LD	A,$F0
@@ -1269,7 +1269,7 @@ HB_CPU1:
 	LD	C,(CPUOSC / 2) / 1000000
 	LD	DE,(CPUOSC / 2) / 1000
 ;
-#IF (Z180_CLKDIV >= 1)
+#IF (Z180_CLKDIV == 1)
 	LD	A,(HB_CPUTYPE)	; GET CPU TYPE
 	CP	2		; Z8S180 REV K OR BETTER?
 	JR	C,HB_CPU2	; IF NOT, NOT POSSIBLE!
@@ -1279,19 +1279,23 @@ HB_CPU1:
 	; REFLECT SPEED CHANGE
 	LD	C,CPUOSC / 1000000
 	LD	DE,CPUOSC / 1000
-#ENDIF
-
-#IF (Z180_CLKDIV >= 2)
+#ELSE
+;
+#IF (Z180_CLKDIV == 2)
+	LD	A,(HB_CPUTYPE)	; GET CPU TYPE
 	CP	3		; Z8S180 REV N OR BETTER?
 	JR	C,HB_CPU2	; IF NOT, NOT POSSIBLE!
 	; SET CPU MULTIPLIER TO 1 RESULTING IN XTAL * 2 SPEED
 	LD	A,$80
-	OUT0	(Z180_CMR),A
+	OUT0	(Z180_CMR),A	; MUST SET CMR BEFORE CCR
+	OUT0	(Z180_CCR),A
 	; REFLECT SPEED CHANGE
 	LD	C,(CPUOSC * 2) / 1000000
 	LD	DE,(CPUOSC * 2) / 1000
 #ENDIF
 ;
+#ENDIF
+;
 HB_CPU2:
 	; SAVE CPU SPEED IN CONFIG BLOCK
 	LD	A,C