diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index 357866c7c..890dcf7e9 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -320,8 +320,6 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonacc
         bone = skel->createBone();
     if(parent) parent->addChild(bone);
 
-    if(!node->boneTrafo)
-        bone->setManuallyControlled(true);
     bone->setOrientation(node->trafo.rotation);
     bone->setPosition(node->trafo.pos);
     bone->setScale(Ogre::Vector3(node->trafo.scale));
@@ -338,7 +336,7 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonacc
     Nif::ExtraPtr e = node->extra;
     while(!e.empty())
     {
-        if(e->recType == Nif::RC_NiTextKeyExtraData)
+        if(e->recType == Nif::RC_NiTextKeyExtraData && !nonaccum)
         {
             const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
             textkeys = extractTextKeys(tk);