diff --git a/bin/mega65.rom b/bin/mega65.rom
index 2b08841d..08a2d57b 100644
Binary files a/bin/mega65.rom and b/bin/mega65.rom differ
diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom
index 4c18426b..01604809 100644
Binary files a/bin/mega65_pxlfont.rom and b/bin/mega65_pxlfont.rom differ
diff --git a/src/,,config_mega65.s b/src/,,config_mega65.s
index 823fb077..63e33307 100644
--- a/src/,,config_mega65.s
+++ b/src/,,config_mega65.s
@@ -110,3 +110,8 @@
 ; --- Other
 
 ;; #CONFIG# COMPRESSION_LVL_2          NO
+
+
+; --- Temporary hotfixes
+
+;; #CONFIG# HOTFIX_CHARPTR             YES
diff --git a/src/kernal/screen_m65/mega65_scrmodeset.s b/src/kernal/screen_m65/mega65_scrmodeset.s
index b060e736..56b2d3b4 100644
--- a/src/kernal/screen_m65/mega65_scrmodeset.s
+++ b/src/kernal/screen_m65/mega65_scrmodeset.s
@@ -91,6 +91,8 @@ m65_scrmodeset_internal: ; entry point for M65_MODE65
 	stx VIC_COLPTR+0
 	stx VIC_COLPTR+1
 
+!ifndef CONFIG_HOTFIX_CHARPTR {
+
 	; Set the following location:
 	; - VIC_CHARPTR                   - for character generator location
 	
@@ -100,6 +102,7 @@ m65_scrmodeset_internal: ; entry point for M65_MODE65
 	sta VIC_CHARPTR+1
 	lda #$01
 	sta VIC_CHARPTR+2
+}
 
 	; Set the following locations:
 	; - M65_SCRGUARD, M65_COLGUARD    - guards for virtual screen end