diff --git a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
index 8067fc0183..23a6897b4b 100644
--- a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
+++ b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
@@ -44,7 +44,7 @@ public class AminatouTheFateShifter extends CardImpl {
     }
 
     public AminatouTheFateShifter(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{W}{U}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{W}{U}{B}");
         this.addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.AMINATOU);
 
@@ -56,7 +56,7 @@ public class AminatouTheFateShifter extends CardImpl {
 
         // -1: Exile another target permanent you own, then return it to the battlefield under your control.
         ability = new LoyaltyAbility(new ExileTargetForSourceEffect(), -1);
-        ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect());
+        ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
 
@@ -68,6 +68,7 @@ public class AminatouTheFateShifter extends CardImpl {
         // Aminatou, the Fateshifter can be your commander.
         this.addAbility(CanBeYourCommanderAbility.getInstance());
     }
+
     public AminatouTheFateShifter(final AminatouTheFateShifter card) {
         super(card);
     }
@@ -79,6 +80,7 @@ public class AminatouTheFateShifter extends CardImpl {
 }
 
 class AminatouPlusEffect extends OneShotEffect {
+
     public AminatouPlusEffect() {
         super(Outcome.DrawCard);
         staticText = "draw a card, then put a card from your hand on top of your library";
@@ -118,10 +120,11 @@ class AminatouPlusEffect extends OneShotEffect {
 }
 
 class AminatouUltimateEffect extends OneShotEffect {
-    public AminatouUltimateEffect (){
+
+    public AminatouUltimateEffect() {
         super(Outcome.Benefit);
-        staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou," +
-                " the Fateshifter controlled by the next player in the chosen direction.";
+        staticText = "Choose left or right. Each player gains control of all nonland permanents other than Aminatou,"
+                + " the Fateshifter controlled by the next player in the chosen direction.";
     }
 
     public AminatouUltimateEffect(final AminatouUltimateEffect effect) {
@@ -129,7 +132,9 @@ class AminatouUltimateEffect extends OneShotEffect {
     }
 
     @Override
-    public AminatouUltimateEffect copy(){return new AminatouUltimateEffect(this);}
+    public AminatouUltimateEffect copy() {
+        return new AminatouUltimateEffect(this);
+    }
 
     @Override
     public boolean apply(Game game, Ability source) {
@@ -154,7 +159,7 @@ class AminatouUltimateEffect extends OneShotEffect {
                     return false;
                 }
                 // skip players out of range
-                if (!game.getState().getPlayersInRange(controller.getId(), game).contains(nextPlayer)){
+                if (!game.getState().getPlayersInRange(controller.getId(), game).contains(nextPlayer)) {
                     continue;
                 }
                 // save first next player to check for iteration stop
@@ -164,7 +169,7 @@ class AminatouUltimateEffect extends OneShotEffect {
                 FilterNonlandPermanent nextPlayerNonlandPermanentsFilter = new FilterNonlandPermanent();
                 nextPlayerNonlandPermanentsFilter.add(new ControllerIdPredicate(nextPlayer));
                 for (Permanent permanent : game.getBattlefield().getAllActivePermanents(nextPlayerNonlandPermanentsFilter, game)) {
-                    if (permanent.getId().equals(source.getSourceId())){
+                    if (permanent.getId().equals(source.getSourceId())) {
                         continue;
                     }
                     ContinuousEffect effect = new GainControlTargetEffect(Duration.EndOfGame, currentPlayer);
@@ -188,4 +193,3 @@ class AminatouUltimateEffect extends OneShotEffect {
         return nextPlayerId;
     }
 }
-
diff --git a/Mage.Sets/src/mage/cards/t/TheEldestReborn.java b/Mage.Sets/src/mage/cards/t/TheEldestReborn.java
index 666e52d657..c8120d042e 100644
--- a/Mage.Sets/src/mage/cards/t/TheEldestReborn.java
+++ b/Mage.Sets/src/mage/cards/t/TheEldestReborn.java
@@ -1,4 +1,3 @@
-
 package mage.cards.t;
 
 import java.util.UUID;
@@ -13,7 +12,6 @@ import mage.constants.SagaChapter;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.filter.FilterCard;
-import mage.filter.StaticFilters;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.mageobject.CardTypePredicate;
@@ -35,11 +33,12 @@ public final class TheEldestReborn extends CardImpl {
     }
 
     private static final FilterControlledPermanent filterSacrifice = new FilterControlledPermanent("creature or planeswalker");
+
     static {
         filterSacrifice.add(Predicates.or(
-                        new CardTypePredicate(CardType.CREATURE),
-                        new CardTypePredicate(CardType.PLANESWALKER)
-                ));
+                new CardTypePredicate(CardType.CREATURE),
+                new CardTypePredicate(CardType.PLANESWALKER)
+        ));
 
     }
 
diff --git a/Mage/src/main/java/mage/abilities/common/SagaAbility.java b/Mage/src/main/java/mage/abilities/common/SagaAbility.java
index 954ed8930d..624221c13e 100644
--- a/Mage/src/main/java/mage/abilities/common/SagaAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/SagaAbility.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.common;
 
 import mage.abilities.Ability;
@@ -138,7 +137,8 @@ class ChapterTriggeredAbility extends TriggeredAbilityImpl {
         if (event.getTargetId().equals(getSourceId()) && event.getData().equals(CounterType.LORE.getName())) {
             int amountAdded = event.getAmount();
             int loreCounters = amountAdded;
-            Permanent sourceSaga = game.getPermanentOrLKIBattlefield(getSourceId());
+            //Permanent sourceSaga = game.getPermanentOrLKIBattlefield(getSourceId());  BUG #5393
+            Permanent sourceSaga = game.getPermanent(getSourceId());
             if (sourceSaga == null) {
                 sourceSaga = game.getPermanentEntering(getSourceId());
             }