diff --git a/src/main/java/net/minecraftforge/common/model/animation/Clips.java b/src/main/java/net/minecraftforge/common/model/animation/Clips.java
index 8528b335c1..7955d8b884 100644
--- a/src/main/java/net/minecraftforge/common/model/animation/Clips.java
+++ b/src/main/java/net/minecraftforge/common/model/animation/Clips.java
@@ -282,15 +282,14 @@ public final class Clips
                     return Optional.absent();
                 }
                 IJoint joint = (IJoint)part.get();
+                // TODO: Cache clip application?
                 TRSRTransformation jointTransform = clip.apply(joint).apply(time).compose(joint.getInvBindPose());
-                Optional<TRSRTransformation> parentTransform = Optional.absent();
-                if(joint.getParent().isPresent())
+                Optional<? extends IJoint> parent = joint.getParent();
+                while(parent.isPresent())
                 {
-                    parentTransform = apply(Optional.of(joint.getParent().get()));
-                }
-                if(parentTransform.isPresent())
-                {
-                    jointTransform = parentTransform.get().compose(jointTransform);
+                    TRSRTransformation parentTransform = clip.apply(parent.get()).apply(time);
+                    jointTransform = parentTransform.compose(jointTransform);
+                    parent = parent.get().getParent();
                 }
                 return Optional.of(jointTransform);
             }