diff --git a/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java b/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java
index f427b31d71..ce1635ac7c 100644
--- a/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java
+++ b/Mage.Sets/src/mage/cards/s/ShireiShizosCaretaker.java
@@ -57,7 +57,7 @@ import mage.target.targetpointer.FixedTarget;
 public class ShireiShizosCaretaker extends CardImpl {
 
     public ShireiShizosCaretaker(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Spirit");
 
@@ -151,7 +151,7 @@ class ShireiShizosCaretakerEffect extends OneShotEffect {
             Effect effect = new ShireiShizosCaretakerReturnEffect(shireiId);
             effect.setText("return that card to the battlefield if {this} is still on the battlefield");
             DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect);
-            delayedAbility.getEffects().get(0).setTargetPointer(new FixedTarget(card.getId()));
+            delayedAbility.getEffects().get(0).setTargetPointer(new FixedTarget(card.getId(), card.getZoneChangeCounter(game)));
             game.addDelayedTriggeredAbility(delayedAbility, source);
             return true;
         }