diff --git a/canister_templates/experimental.wasm b/canister_templates/experimental.wasm
index 5f460e4201..294973c433 100644
Binary files a/canister_templates/experimental.wasm and b/canister_templates/experimental.wasm differ
diff --git a/canister_templates/stable.wasm b/canister_templates/stable.wasm
index faa95e136d..c10094a78e 100644
Binary files a/canister_templates/stable.wasm and b/canister_templates/stable.wasm differ
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs
index 55063e6b01..f99d6b240d 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_contains_key.rs
@@ -22,7 +22,10 @@ impl JsFn for NativeFunction {
             .with(|stable_b_tree_maps| {
                 let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-                stable_b_tree_maps[&memory_id].contains_key(&AzleStableBTreeMapKey { bytes: key })
+                stable_b_tree_maps
+                    .get(&memory_id)
+                    .unwrap()
+                    .contains_key(&AzleStableBTreeMapKey { bytes: key })
             })
             .into()
     }
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs
index 0f972b88ba..685271b191 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_get.rs
@@ -21,7 +21,10 @@ impl JsFn for NativeFunction {
         let value_option = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-            stable_b_tree_maps[&memory_id].get(&AzleStableBTreeMapKey { bytes: key })
+            stable_b_tree_maps
+                .get(&memory_id)
+                .unwrap()
+                .get(&AzleStableBTreeMapKey { bytes: key })
         });
 
         // TODO could we somehow encode the entire option here more easily
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs
index cf0c69ea6f..24d7ac9818 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_is_empty.rs
@@ -16,7 +16,7 @@ impl JsFn for NativeFunction {
             .with(|stable_b_tree_maps| {
                 let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-                stable_b_tree_maps[&memory_id].is_empty()
+                stable_b_tree_maps.get(&memory_id).unwrap().is_empty()
             })
             .into()
     }
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs
index 8d33cc0e23..49211048fc 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_items.rs
@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let items: Vec<Vec<Vec<u8>>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs
index 0a72a014d0..0ed66931aa 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_keys.rs
@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let keys: Vec<Vec<u8>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs
index 0f6b4cde96..a8182004e0 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_len.rs
@@ -15,7 +15,7 @@ impl JsFn for NativeFunction {
         let len = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
 
-            stable_b_tree_maps[&memory_id].len()
+            stable_b_tree_maps.get(&memory_id).unwrap().len()
         });
 
         context.new_string(&len.to_string()).into()
diff --git a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs
index edd0b3bb0e..3e14589afa 100644
--- a/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs
+++ b/src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/stable_b_tree_map_values.rs
@@ -29,7 +29,7 @@ impl JsFn for NativeFunction {
 
         let values: Vec<Vec<u8>> = STABLE_B_TREE_MAPS.with(|stable_b_tree_maps| {
             let stable_b_tree_maps = stable_b_tree_maps.borrow();
-            let stable_b_tree_map = &stable_b_tree_maps[&memory_id];
+            let stable_b_tree_map = stable_b_tree_maps.get(&memory_id).unwrap();
 
             stable_b_tree_map
                 .iter()