diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantStringConsolidation.java b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantStringConsolidation.java
index a507a5734..9e11fffd2 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantStringConsolidation.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass2ConstantStringConsolidation.java
@@ -134,6 +134,7 @@ public class Pass2ConstantStringConsolidation extends Pass2SsaOptimization {
          if(getScope().getLocalSymbol(candidateName) == null) {
             return candidateName;
          }
+         i++;
       } while(true);
    }
 
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index ce8636d3f..9737dea42 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -467,6 +467,11 @@ public class TestPrograms {
       compileAndCompare("examples/nes/nes-demo.c");
    }
 
+   @Test
+   public void testCx16Vera() throws IOException, URISyntaxException {
+      compileAndCompare("examples/cx16/cx16-vera.c");
+   }
+
    @Test
    public void testCx16VeraLayers() throws IOException, URISyntaxException {
       compileAndCompare("examples/cx16/cx16-veralayers.c");
@@ -3546,6 +3551,11 @@ public class TestPrograms {
       compileAndCompare("string-const-consolidation.c");
    }
 
+   @Test
+   public void testStringConstConsolidationRoot() throws IOException, URISyntaxException {
+      compileAndCompare("string-const-consolidation-root.c", log());
+   }
+
    @Test
    public void testCommentsGlobalInit() throws IOException, URISyntaxException {
       compileAndCompare("test-comments-global.c");
diff --git a/src/test/kc/string-const-consolidation-root.c b/src/test/kc/string-const-consolidation-root.c
new file mode 100644
index 000000000..cbbf04573
--- /dev/null
+++ b/src/test/kc/string-const-consolidation-root.c
@@ -0,0 +1,30 @@
+// Tests that multiple different identical strings are consolidated to a root variable
+
+void main() {
+    print1();
+    print2();
+}
+
+char* s = "string3";
+char* s1 = "string4";
+
+
+void print1() {
+    print("string1");
+    print("string2");
+    print(s);
+}
+
+void print2() {
+    print("string1");
+    print("string2");
+    print(s1);
+}
+
+char* screen = 0x400;
+
+void print(char* s) {
+    while(*s) {
+        *screen++ = *s++;
+    }
+}
\ No newline at end of file