diff --git a/configure.py b/configure.py
index 513439a54..e60b25755 100755
--- a/configure.py
+++ b/configure.py
@@ -1416,7 +1416,7 @@ config.libs = [
     ActorRel(Matching, "d_a_obj_lpalm"),
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_obj_monument"),
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_obj_movebox", extra_cflags=['-pragma "nosyminline on"']),
-    ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_mshokki", extra_cflags=['-pragma "nosyminline on"']),
+    ActorRel(Matching, "d_a_obj_mshokki", extra_cflags=['-pragma "nosyminline on"']),
     ActorRel(Matching, "d_a_obj_ohatch"),
     ActorRel(Matching, "d_a_obj_otble", extra_cflags=['-pragma "nosyminline on"']),
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_obj_pbco"),
diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp
index 1861ed840..d5c8d295b 100644
--- a/src/d/actor/d_a_obj_mshokki.cpp
+++ b/src/d/actor/d_a_obj_mshokki.cpp
@@ -206,16 +206,14 @@ void daObjMshokki_c::co_hitCallback(fopAc_ac_c* a_this, dCcD_GObjInf*, fopAc_ac_
         if (fVar1 > 1.0f) {
             fVar1 = 1.0f;
         }
+        s16 angle_x = l_data[i_this->m60C].m0C * fVar1;
+        s16 angle_y = other_actor->current.angle.y;
+        i_this->shape_angle.x = angle_x;
+        i_this->shape_angle.y = angle_y;
 #if VERSION == VERSION_DEMO
-        i_this->shape_angle.x = l_data[i_this->m60C].m0C * fVar1;
-        s32 sVar3 = other_actor->current.angle.y;
-        i_this->shape_angle.y = sVar3;
-        i_this->m61C = sVar3 + HIO(m18) * 2.0f;
+        i_this->m61C = angle_y + HIO(m18) * 2.0f;
 #else
-        s16 sVar3 = other_actor->current.angle.y;
-        i_this->shape_angle.x = l_data[i_this->m60C].m0C * fVar1;
-        i_this->shape_angle.y = sVar3;
-        i_this->m61C = sVar3 + (s16)(HIO(m18) * 2.0f);
+        i_this->m61C = angle_y + (s16)(HIO(m18) * 2.0f);
 #endif
     }
 }