diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java
index bc49db973..68c9db672 100644
--- a/src/main/java/noppes/npcs/CommonProxy.java
+++ b/src/main/java/noppes/npcs/CommonProxy.java
@@ -49,7 +49,8 @@ public class CommonProxy implements IGuiHandler {
                 HashSet<Animation> playingAnimations = CustomNpcs.proxy.hasClient() ? clientPlayingAnimations : serverPlayingAnimations;
                 for (int i = 0; i < animationTimer.elapsedTicks; ++i) {
                     for (Animation animation : playingAnimations) {
-                        if (animation.parent.isActive() && totalTicks % animation.currentFrame().tickDuration() == 0) {
+                        int tickDuration = animation.currentFrame().tickDuration();
+                        if (animation.parent.isActive() && totalTicks % tickDuration == 0) {
                             animation.increaseTime();
                         }
                     }
diff --git a/src/main/java/noppes/npcs/controllers/data/Frame.java b/src/main/java/noppes/npcs/controllers/data/Frame.java
index 22077bf1a..df810234b 100644
--- a/src/main/java/noppes/npcs/controllers/data/Frame.java
+++ b/src/main/java/noppes/npcs/controllers/data/Frame.java
@@ -77,7 +77,7 @@ public class Frame implements IFrame {
 	}
 
     public int tickDuration() {
-        return this.tickDuration;
+        return !this.customized && this.parent != null ? this.parent.tickDuration : this.tickDuration;
     }
 
     public IFrame setTickDuration(int tickDuration) {