diff --git a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java
index 02a7f11..fb62a92 100644
--- a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java
+++ b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java
@@ -45,9 +45,13 @@ public abstract class BaseViewAnimator {
 
     protected abstract void prepare(View target);
 
-    public void animate(View target) {
+    public BaseViewAnimator setTarget(View target) {
         reset(target);
         prepare(target);
+        return this;
+    }
+
+    public void animate() {
         start();
     }
 
diff --git a/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java b/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java
index 47414aa..4d10582 100644
--- a/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java
+++ b/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java
@@ -139,6 +139,7 @@ public void stop(boolean reset){
     }
 
     private BaseViewAnimator play() {
+        animator.setTarget(target);
         animator.setDuration(duration)
                 .setInterpolator(interpolator)
                 .setStartDelay(delay);
@@ -149,7 +150,7 @@ private BaseViewAnimator play() {
             }
         }
 
-        animator.animate(target);
+        animator.animate();
         return animator;
     }