diff --git a/src/main/java/noppes/npcs/controllers/data/Animation.java b/src/main/java/noppes/npcs/controllers/data/Animation.java
index fa290975c..c7d006198 100644
--- a/src/main/java/noppes/npcs/controllers/data/Animation.java
+++ b/src/main/java/noppes/npcs/controllers/data/Animation.java
@@ -360,7 +360,7 @@ public class Animation implements IAnimation {
      * to the new local instance on entity's AnimationData,
      * and clear them from the global instance.
      */
-    public void takeTasksFrom(Animation animation) {
+    public void moveFromGlobalToLocal(Animation animation) {
         this.onAnimationStart = animation.onAnimationStart;
         this.onAnimationFrame = animation.onAnimationFrame;
         this.onAnimationEnd = animation.onAnimationEnd;
@@ -368,6 +368,9 @@ public class Animation implements IAnimation {
         animation.onAnimationEnd = null;
         animation.onAnimationFrame = null;
         animation.onAnimationStart = null;
+
+        this.dataStore.putAll(animation.dataStore);
+        animation.dataStore.clear();
     }
     
     
diff --git a/src/main/java/noppes/npcs/controllers/data/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
index ea5da6a84..f5e6d80b4 100644
--- a/src/main/java/noppes/npcs/controllers/data/AnimationData.java
+++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java
@@ -272,7 +272,7 @@ public class AnimationData implements IAnimationData {
             newAnim.currentFrame = 0;
             newAnim.currentFrameTime = 0;
             newAnim.parent = this;
-            newAnim.takeTasksFrom((Animation) animation);
+            newAnim.moveFromGlobalToLocal((Animation) animation);
         }