diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 2f2ffccb5e..d51a30a770 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -121,24 +121,15 @@ void Animation::addObjectList(Ogre::SceneNode *node, const std::string &model, b
             Ogre::Bone *bone = boneiter.getNext();
             Ogre::UserObjectBindings &bindings = bone->getUserObjectBindings();
             const Ogre::Any &data = bindings.getUserAny(NifOgre::sTextKeyExtraDataID);
-            if(data.isEmpty() || !Ogre::any_cast<bool>(data))
-                continue;
+            if(data.isEmpty()) continue;
 
+            objlist.mTextKeys[bone->getHandle()] = Ogre::any_cast<NifOgre::TextKeyMap>(data);
             if(!mNonAccumRoot)
             {
                 mAccumRoot = mInsert;
                 mNonAccumRoot = mSkelBase->getSkeleton()->getBone(bone->getName());
             }
 
-            for(int i = 0;i < skel->getNumAnimations();i++)
-            {
-                Ogre::Animation *anim = skel->getAnimation(i);
-                const Ogre::Any &groupdata = bindings.getUserAny(std::string(NifOgre::sTextKeyExtraDataID)+
-                                                                 "@"+anim->getName());
-                if(!groupdata.isEmpty())
-                    mTextKeys[anim->getName()] = Ogre::any_cast<NifOgre::TextKeyMap>(groupdata);
-            }
-
             break;
         }
     }
@@ -451,7 +442,7 @@ void Animation::play(const std::string &groupname, const std::string &start, con
             {
                 Ogre::SkeletonInstance *skel = iter->mSkelBase->getSkeleton();
                 mCurrentAnim = skel->getAnimation(groupname);
-                mCurrentKeys = &mTextKeys[groupname];
+                mCurrentKeys = &iter->mTextKeys.begin()->second;
                 mCurrentGroup = groupname;
                 mCurrentControllers = &iter->mControllers;
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 472a6289c9..b60bd21a85 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -46,7 +46,6 @@ protected:
     Ogre::SceneNode *mInsert;
     Ogre::Entity *mSkelBase;
     std::vector<NifOgre::ObjectList> mObjectLists;
-    std::map<std::string,NifOgre::TextKeyMap> mTextKeys;
     Ogre::Node *mAccumRoot;
     Ogre::Bone *mNonAccumRoot;
     Ogre::Vector3 mAccumulate;
diff --git a/components/nifogre/ogrenifloader.hpp b/components/nifogre/ogrenifloader.hpp
index b53815fa0f..8e220ea38d 100644
--- a/components/nifogre/ogrenifloader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@@ -50,6 +50,8 @@ struct ObjectList {
     // bones in the mSkelBase which are NiCamera nodes.
     std::vector<Ogre::Bone*> mCameras;
 
+    std::map<int,TextKeyMap> mTextKeys;
+
     std::vector<Ogre::Controller<Ogre::Real> > mControllers;
 
     ObjectList() : mSkelBase(0)
diff --git a/components/nifogre/skeleton.cpp b/components/nifogre/skeleton.cpp
index 5eb0436143..3660be81bd 100644
--- a/components/nifogre/skeleton.cpp
+++ b/components/nifogre/skeleton.cpp
@@ -193,6 +193,7 @@ void NIFSkeletonLoader::buildBones(Ogre::Skeleton *skel, const Nif::Node *node,
             const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
             textkeys = extractTextKeys(tk);
             animroot = bone;
+            bone->getUserObjectBindings().setUserAny(sTextKeyExtraDataID, Ogre::Any(textkeys));
         }
         e = e->extra;
     }
@@ -255,9 +256,6 @@ void NIFSkeletonLoader::loadResource(Ogre::Resource *resource)
         return;
     }
 
-    Ogre::UserObjectBindings &bindings = animroot->getUserObjectBindings();
-    bindings.setUserAny(sTextKeyExtraDataID, Ogre::Any(true));
-
     std::string currentgroup;
     TextKeyMap::const_iterator keyiter = textkeys.begin();
     for(keyiter = textkeys.begin();keyiter != textkeys.end();keyiter++)
@@ -281,9 +279,6 @@ void NIFSkeletonLoader::loadResource(Ogre::Resource *resource)
         }
 
         buildAnimation(skel, currentgroup, ctrls, targets, keyiter->first, lastkeyiter->first);
-
-        TextKeyMap groupkeys(keyiter, ++lastkeyiter);
-        bindings.setUserAny(std::string(sTextKeyExtraDataID)+"@"+currentgroup, Ogre::Any(groupkeys));
     }
 }