1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenTuples.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenTuples.java
index 9e2f7421..44a6397f 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenTuples.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenTuples.java
@@ -60,7 +60,7 @@ public class PatioCodeGenTuples {
             context = context.addInstruction(new PatioMemoryStore(
                 tuplePointer,
                 tupleLayout,
-                List.of(elementIndex),
+                elementOffset(elementIndex),
                 element,
                 source
             ));
@@ -107,13 +107,17 @@ public class PatioCodeGenTuples {
             target,
             tuplePointer,
             tupleDataLayout(elementCount),
-            List.of(elementIndex),
+            elementOffset(elementIndex),
             source
         ));
 
         return context.toResult(target);
     }
 
+    private static List<Integer> elementOffset(int elementIndex) {
+        return List.of(elementIndex);
+    }
+
     private static PatioDataLayout tupleDataLayout(int elementCount) {
         return PatioDataLayouts.struct(Lists.repeat(
             PatioDataLayouts.INT,