diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 01b69459ce..e8777b5654 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -126,9 +126,6 @@ void NpcAnimation::updateNpcBase()
         mHairModel = "meshes\\" + store.get<ESM::BodyPart>().find("WerewolfHair")->mModel;
     }
 
-    mBodyPrefix = "b_n_" + mNpc->mRace;
-    Misc::StringUtils::toLower(mBodyPrefix);
-
     bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
     std::string smodel = (mViewMode != VM_FirstPerson) ?
                          (!isWerewolf ? !isBeast ? "meshes\\base_anim.nif"
@@ -144,7 +141,7 @@ void NpcAnimation::updateNpcBase()
         addAnimSource(smodel);
         if(!isWerewolf)
         {
-            if(mBodyPrefix.find("argonian") != std::string::npos)
+            if(Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
                 addAnimSource("meshes\\argonian_swimkna.nif");
             else if(!mNpc->isMale() && !isBeast)
                 addAnimSource("meshes\\base_anim_female.nif");
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index d8f9246cbb..88e4a9e048 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -37,11 +37,10 @@ private:
     // Bounded Parts
     NifOgre::ObjectList mObjectParts[ESM::PRT_Count];
 
-    const ESM::NPC  *mNpc;
-    std::string     mHeadModel;
-    std::string     mHairModel;
-    std::string     mBodyPrefix;
-    ViewMode        mViewMode;
+    const ESM::NPC *mNpc;
+    std::string    mHeadModel;
+    std::string    mHairModel;
+    ViewMode       mViewMode;
     bool mShowWeapons;
 
     float mTimeToChange;