1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java
index 40bdf823..9aaf2666 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenContext.java
@@ -779,14 +779,13 @@ public record PatioCodeGenContext(
             this.compilationUnitContext,
             this.blockStack.minus(0),
             new FunctionContext(
-                // TODO: some of these fields should be popped
                 this.blockStack.get(0).temporaryStack,
                 this.blockStack.get(0).instructions,
                 this.functionContext.localsByName,
                 this.functionContext.shidNameToLocal,
                 this.functionContext.waitingForShidLocal,
-                this.functionContext.stashedEffectHandler,
-                this.functionContext.stashedGcRootStackIndex,
+                this.blockStack.get(0).stashedEffectHandler,
+                this.blockStack.get(0).stashedGcRootStackIndex,
                 this.blockStack.get(0).onReturn
             )
         ).toResult(this.functionContext.instructions);