diff --git a/Cargo.lock b/Cargo.lock
index be7ba59..38db9fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,7 +10,7 @@ checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 
 [[package]]
 name = "aise"
-version = "2.36.3"
+version = "2.36.4"
 dependencies = [
  "bincode",
  "bitflags",
@@ -828,7 +828,7 @@ checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 [[package]]
 name = "samase_plugin"
 version = "0.5.0"
-source = "git+https://github.com/neivv/samase_plugin?rev=1660aa7eb13daf1b903911ecf571c2b4a4c33fc8#1660aa7eb13daf1b903911ecf571c2b4a4c33fc8"
+source = "git+https://github.com/neivv/samase_plugin?rev=4286c88cef7079aebb4046cf7194e1afe1ff22bd#4286c88cef7079aebb4046cf7194e1afe1ff22bd"
 dependencies = [
  "byteorder",
  "flate2",
@@ -843,7 +843,7 @@ dependencies = [
 [[package]]
 name = "samase_shim"
 version = "0.5.0"
-source = "git+https://github.com/neivv/samase_plugin?rev=1660aa7eb13daf1b903911ecf571c2b4a4c33fc8#1660aa7eb13daf1b903911ecf571c2b4a4c33fc8"
+source = "git+https://github.com/neivv/samase_plugin?rev=4286c88cef7079aebb4046cf7194e1afe1ff22bd#4286c88cef7079aebb4046cf7194e1afe1ff22bd"
 dependencies = [
  "byteorder",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 7c3e490..422b2a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aise"
-version = "2.36.3"
+version = "2.36.4"
 authors = ["Markus Heikkinen <ittevien@gmail.com>"]
 edition = "2018"
 
@@ -62,11 +62,11 @@ rev = "e8e847864c2938735040ca3c68ef1cf9e03b692f"
 
 [target.'cfg(target_arch = "x86")'.dependencies.samase_shim]
 git = "https://github.com/neivv/samase_plugin"
-rev = "1660aa7eb13daf1b903911ecf571c2b4a4c33fc8"
+rev = "4286c88cef7079aebb4046cf7194e1afe1ff22bd"
 
 [dependencies.samase_plugin]
 git = "https://github.com/neivv/samase_plugin"
-rev = "1660aa7eb13daf1b903911ecf571c2b4a4c33fc8"
+rev = "4286c88cef7079aebb4046cf7194e1afe1ff22bd"
 
 [features]
 opengl = ["cgmath", "euclid", "font-kit", "glium", "gl"]
diff --git a/src/ai.rs b/src/ai.rs
index 3c00837..2970f86 100644
--- a/src/ai.rs
+++ b/src/ai.rs
@@ -1345,8 +1345,11 @@ pub unsafe extern fn step_region_hook(
 }
 
 pub unsafe extern fn focus_disabled_hook(u: *mut c_void, orig: unsafe extern fn(*mut c_void)) {
-    let globals = Globals::get("focus_air");
-    if !globals.global_ai_mode.disable_spell_focus {
+    let skip = {
+        let globals = Globals::get("focus_air");
+        globals.global_ai_mode.disable_spell_focus
+    };
+    if !skip {
         orig(u);
     }
 }