diff --git a/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_pbuz1_derefidx_vbuyy.asm b/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_pbuz1_derefidx_vbuyy.asm
new file mode 100644
index 000000000..effab3eac
--- /dev/null
+++ b/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_pbuz1_derefidx_vbuyy.asm
@@ -0,0 +1 @@
+ora ({z1}),y
\ No newline at end of file
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index 229acfa5f..e8c47527b 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -45,6 +45,11 @@ public class TestPrograms {
       AsmFragmentTemplateUsages.logUsages(log, false, false,  false, false, false, false);
    }
 
+   @Test
+   public void testNoromCharset() throws IOException, URISyntaxException {
+      compileAndCompare("norom-charset");
+   }
+
    @Test
    public void testChargenAnalysis() throws IOException, URISyntaxException {
       compileAndCompare("chargen-analysis");
diff --git a/src/test/java/dk/camelot64/kickc/test/kc/norom-charset.kc b/src/test/java/dk/camelot64/kickc/test/kc/norom-charset.kc
new file mode 100644
index 000000000..9d3d55be9
--- /dev/null
+++ b/src/test/java/dk/camelot64/kickc/test/kc/norom-charset.kc
@@ -0,0 +1,33 @@
+// Generate a charset based on a 5x3 pattern stored in 2 bytes
+byte* VIC_MEMORY = $d018;
+byte* SCREEN = $400;
+byte* CHARSET = $3000;
+
+// Stores chars as 15 bits (in 2 bytes) specifying the 3x5
+// The 5x3 char is stored as 5x 3-bit rows followed by a zero. %aaabbbcc cdddeee0
+word[] charset_spec_row = { %1111011111011010, %1111011111011110, %1111001001001110, %1101011011011110 };
+
+void main() {
+    byte* charset = CHARSET+8;
+    for(byte c=0;c!=6;c=c+2) {
+        gen_char3(charset, charset_spec_row[c]);
+        charset = charset+8;
+    }
+    *VIC_MEMORY = (byte)(((word)SCREEN/$40)|((word)CHARSET/$400));
+}
+
+// Generate one 5x3 character from a 16-bit char spec
+// The 5x3 char is stored as 5x 3-bit rows followed by a zero. %aaabbbcc cdddeee0
+void gen_char3(byte* dst, word spec) {
+    for(byte r : 0..4 ) {
+        byte b = 0;
+        for(byte c: 0..2 ) {
+            if((>spec&$80)!=0) {
+                b = b|1;
+            }
+            b = b<<1;
+            spec = spec<<1;
+        }
+        dst[r] = b;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/dk/camelot64/kickc/test/kc/norom.asm b/src/test/java/dk/camelot64/kickc/test/kc/norom.asm
new file mode 100644
index 000000000..1b4dc35c9
--- /dev/null
+++ b/src/test/java/dk/camelot64/kickc/test/kc/norom.asm
@@ -0,0 +1,71 @@
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+  .label VIC_MEMORY = $d018
+  .label SCREEN = $400
+  .label CHARSET = $3000
+main: {
+    .label charset = 2
+    .label c = 4
+    .label spec = 5
+    .label b = 7
+
+    lda #26
+    sta c
+    lda #<CHARSET+8
+    sta charset
+    lda #>CHARSET+8
+    sta charset+1
+  b2:
+
+    ldy #0
+  gb1:
+    ldx #0
+    stx b
+  gb2:
+sr1:asl charset_spec_row_lo
+sr2:rol charset_spec_row_hi
+    rol b
+    inx
+    cpx #3
+    bne gb2
+    lda b
+    sta (charset),y
+    iny
+    cpy #5
+    bne gb1
+
+    lda charset
+    clc
+    adc #8
+    sta charset
+    bcc !+
+    inc charset+1
+  !:
+    inc sr1+1
+    inc sr2+1
+    dec c
+    bne b2
+    lda #SCREEN/$40|CHARSET/$400
+    sta VIC_MEMORY
+    rts
+}
+
+charset_spec_hi:
+    .word /*A*/ %11110111, /*B*/ %11110111, /*C*/ %11110010, /*D*/ %11010110
+    .word /*E*/ %11110011, /*F*/ %11110011, /*G*/ %11110010, /*H*/ %10110111
+    .word /*I*/ %11101001, /*J*/ %11100100, /*K*/ %10110111, /*L*/ %10010010
+    .word /*M*/ %10111111, /*N*/ %11010110, /*O*/ %11110110, /*P*/ %11110111
+    .word /*Q*/ %11110110, /*R*/ %11110111, /*S*/ %11110011, /*T*/ %11101001
+    .word /*U*/ %10110110, /*V*/ %10110101, /*W*/ %10110111, /*X*/ %10110101
+    .word /*Y*/ %10110111, /*Z*/ %11100101
+
+
+charset_spec_lo:
+    .byte /*A*/ %11011010, /*B*/ %11011110, /*C*/ %01001110, /*D*/ %11011110
+    .byte /*E*/ %01001110, /*F*/ %01001000, /*G*/ %11011110, /*H*/ %11011010
+    .byte /*I*/ %00101110, /*J*/ %11011100, /*K*/ %01011010, /*L*/ %01001110
+    .byte /*M*/ %11011010, /*N*/ %11011010, /*O*/ %11011110, /*P*/ %11001000
+    .byte /*Q*/ %11110110, /*R*/ %01011010, /*S*/ %10011110, /*T*/ %00100100
+    .byte /*U*/ %11011110, /*V*/ %10110010, /*W*/ %11111010, /*X*/ %01011010
+    .byte /*Y*/ %10100100, /*Z*/ %01001110
\ No newline at end of file