diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 7588a3287..9feb831c9 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1172,14 +1172,10 @@ bool CharacterController::updateWeaponState()
                     effect = store.get<ESM::MagicEffect>().find(effectentry.mEffectID);
 
                     const ESM::Static* castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Hands");
-                    if (mAnimation->hasNode("Left Hand"))
-                        mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Left Hand", effect->mParticle);
-                    else
+                    if (mAnimation->hasNode("Bip01 L Hand"))
                         mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 L Hand", effect->mParticle);
 
-                    if (mAnimation->hasNode("Right Hand"))
-                        mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Right Hand", effect->mParticle);
-                    else
+                    if (mAnimation->hasNode("Bip01 R Hand"))
                         mAnimation->addEffect("meshes\\" + castStatic->mModel, -1, false, "Bip01 R Hand", effect->mParticle);
 
                     switch(effectentry.mRange)
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 91f4f766e..327f59df8 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1042,11 +1042,11 @@ namespace MWRender
             parentNode = mObjectRoot->asGroup();
         else
         {
-            SceneUtil::FindByNameVisitor visitor(bonename);
-            mObjectRoot->accept(visitor);
-            if (!visitor.mFoundNode)
+            NodeMap::iterator found = mNodeMap.find(Misc::StringUtils::lowerCase(bonename));
+            if (found == mNodeMap.end())
                 throw std::runtime_error("Can't find bone " + bonename);
-            parentNode = visitor.mFoundNode;
+
+            parentNode = found->second;
         }
         osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->createInstance(model, parentNode);
         params.mObjects = PartHolderPtr(new PartHolder(node));