diff --git a/src/ast/compiler/optimizer/substitution_map.rs b/src/ast/compiler/optimizer/substitution_map.rs
index 0a5b988..30ddc48 100644
--- a/src/ast/compiler/optimizer/substitution_map.rs
+++ b/src/ast/compiler/optimizer/substitution_map.rs
@@ -170,7 +170,7 @@ impl SubstitutionMap {
                 let value = self.reindex_upvalues(value.clone(), mapping);
                 (
                     BoundKind::Set {
-                        addr: *addr,
+                        addr: self.reindex_addr(*addr, mapping),
                         value,
                     },
                     node.ty.clone(),