diff --git a/configure.py b/configure.py
index 790572a7aa..4cc218802b 100755
--- a/configure.py
+++ b/configure.py
@@ -746,7 +746,7 @@ def MatchingFor(*versions):
             Object(Matching, "mo_enemy/sora_enemy/resource/em_resource_module_impl.cpp"),
             Object(Matching, "mo_enemy/sora_enemy/stop/em_stop_module_impl.cpp"),
             Object(Matching, "mo_enemy/sora_enemy/em_extend_param_accesser.cpp"),
-            Object(NonMatching, "mo_enemy/sora_enemy/em_external_value_accesser.cpp"),
+            Object(Matching, "mo_enemy/sora_enemy/em_external_value_accesser.cpp"),
             Object(Matching, "mo_enemy/sora_enemy/em_target_search_unit.cpp"),
             Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_resource_module_impl.cpp"),
             Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_heap_module_impl.cpp"),
diff --git a/src/mo_enemy/sora_enemy/em_external_value_accesser.cpp b/src/mo_enemy/sora_enemy/em_external_value_accesser.cpp
index 66b49ac627..0b1bca7c28 100644
--- a/src/mo_enemy/sora_enemy/em_external_value_accesser.cpp
+++ b/src/mo_enemy/sora_enemy/em_external_value_accesser.cpp
@@ -54,14 +54,17 @@ s32 emExternalValueAccesser::getNameMsgId(Enemy* em, u32 taskId) {
     return wn->unk21E8;
 }
 
-// NONMATCHING
 nw4r::g3d::ResFileData* emExternalValueAccesser::getFaceTexPtr(Enemy* em, u32 taskId) {
     if (taskId == -1 || taskId == em->m_taskId) {
         return em->getFaceTexPtr();
     }
 
-    const wnemSimple* wn = emWeaponManager::getInstance()->GetManagedWeaponFromTaskID(taskId);
-    return (!wn) ? em->getFaceTexPtr() : em->getFaceTexPtr(wn->unk21EC);
+    wnemSimple* wn = emWeaponManager::getInstance()->GetManagedWeaponFromTaskID(taskId);
+    if (!wn) {
+        return em->getFaceTexPtr();
+    }
+    taskId = wn->unk21EC;
+    return em->getFaceTexPtr(taskId);
 }
 
 float emExternalValueAccesser::getScore(Enemy* em) {