diff --git a/OgreMain/include/OgreTagPoint.h b/OgreMain/include/OgreTagPoint.h
index 5bc634d1471..4511cb57713 100644
--- a/OgreMain/include/OgreTagPoint.h
+++ b/OgreMain/include/OgreTagPoint.h
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "OgrePrerequisites.h"
 
-#include "OgreBone.h"
+#include "OgreNode.h"
 #include "OgreMatrix4.h"
 
 namespace Ogre  {
@@ -57,11 +57,11 @@ namespace Ogre  {
         skeleton which has this tag point. Use the Entity::attachMovableObjectToBone method to attach
         the objects, which creates a new TagPoint on demand.
     */
-    class _OgreExport TagPoint : public Bone
+    class _OgreExport TagPoint : public Node
     {
 
     public:
-        TagPoint(unsigned short handle, Skeleton* creator);
+        TagPoint();
 
         Entity *getParentEntity(void) const;
         MovableObject* getChildObject(void) const;
@@ -106,6 +106,10 @@ namespace Ogre  {
         Entity *mParentEntity;
         MovableObject *mChildObject;
         mutable Affine3 mFullLocalTransform;
+
+        using Node::createChild;
+        Node* createChildImpl(void) override { return NULL; }
+        Node* createChildImpl(const String& name) override { return NULL; }
     };
 
     /** @} */
diff --git a/OgreMain/src/OgreSkeletonInstance.cpp b/OgreMain/src/OgreSkeletonInstance.cpp
index 2b733b20fa6..9f01b1f5325 100644
--- a/OgreMain/src/OgreSkeletonInstance.cpp
+++ b/OgreMain/src/OgreSkeletonInstance.cpp
@@ -188,7 +188,7 @@ namespace Ogre {
     {
         TagPoint* ret;
         if (mFreeTagPoints.empty()) {
-            ret = OGRE_NEW TagPoint(uint16(-1), this);
+            ret = OGRE_NEW TagPoint();
             mActiveTagPoints.push_back(ret);
         } else {
             ret = mFreeTagPoints.front();
@@ -206,7 +206,6 @@ namespace Ogre {
         ret->setPosition(offsetPosition);
         ret->setOrientation(offsetOrientation);
         ret->setScale(Vector3::UNIT_SCALE);
-        ret->setBindingPose();
         bone->addChild(ret);
 
         return ret;
diff --git a/OgreMain/src/OgreTagPoint.cpp b/OgreMain/src/OgreTagPoint.cpp
index 6522cb46f4c..4b2825f1877 100644
--- a/OgreMain/src/OgreTagPoint.cpp
+++ b/OgreMain/src/OgreTagPoint.cpp
@@ -32,9 +32,8 @@ THE SOFTWARE.
 namespace Ogre {
 
     //-----------------------------------------------------------------------------
-    TagPoint::TagPoint(unsigned short handle, Skeleton* creator)
-        : Bone(handle, creator)
-        , mInheritParentEntityOrientation(true)
+    TagPoint::TagPoint()
+        : mInheritParentEntityOrientation(true)
         , mInheritParentEntityScale(true)
         , mParentEntity(0)
         , mChildObject(0)
@@ -96,7 +95,7 @@ namespace Ogre {
     //-----------------------------------------------------------------------------
     void TagPoint::needUpdate(bool forceParentUpdate)
     {
-        Bone::needUpdate(forceParentUpdate);
+        Node::needUpdate(forceParentUpdate);
 
         // We need to tell parent entities node
         if (mParentEntity)
@@ -114,7 +113,7 @@ namespace Ogre {
     void TagPoint::updateFromParentImpl(void) const
     {
         // Call superclass
-        Bone::updateFromParentImpl();
+        Node::updateFromParentImpl();
 
         // Save transform for local skeleton
         mFullLocalTransform.makeTransform(