diff --git a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
index 64533667f5..44168d26c0 100644
--- a/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
+++ b/Mage.Sets/src/mage/cards/a/AminatouTheFateShifter.java
@@ -2,6 +2,7 @@ package mage.cards.a;
 
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
+import mage.abilities.common.CanBeYourCommanderAbility;
 import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
@@ -29,6 +30,10 @@ import mage.target.targetpointer.FixedTarget;
 
 import java.util.UUID;
 
+/**
+ *
+ * @author Colin Redman
+ */
 public class AminatouTheFateShifter extends CardImpl {
 
     private static final FilterPermanent filter = new FilterPermanent("permanent you own");
@@ -59,6 +64,9 @@ public class AminatouTheFateShifter extends CardImpl {
         // Fateshifter controlled by the next player in the chosen direction.
         ability = new LoyaltyAbility(new AminatouUltimateEffect(), -6);
         this.addAbility(ability);
+
+        // Aminatou, the Fateshifter can be your commander.
+        this.addAbility(CanBeYourCommanderAbility.getInstance());
     }
     public AminatouTheFateShifter(final AminatouTheFateShifter card) {
         super(card);
diff --git a/Mage.Sets/src/mage/sets/Commander2018.java b/Mage.Sets/src/mage/sets/Commander2018.java
index ba25746f6a..285dbbf909 100644
--- a/Mage.Sets/src/mage/sets/Commander2018.java
+++ b/Mage.Sets/src/mage/sets/Commander2018.java
@@ -27,7 +27,7 @@ public final class Commander2018 extends ExpansionSet {
         cards.add(new SetCardInfo("Ajani's Chosen", 61, Rarity.RARE, mage.cards.a.AjanisChosen.class));
         cards.add(new SetCardInfo("Akoum Refuge", 231, Rarity.UNCOMMON, mage.cards.a.AkoumRefuge.class));
         cards.add(new SetCardInfo("Akroma's Vengeance", 62, Rarity.RARE, mage.cards.a.AkromasVengeance.class));
-        cards.add(new SetCardInfo("Amninatou, the Fateshifter", 37, Rarity.MYTHIC, mage.cards.a.AminatouTheFateShifter.class));
+        cards.add(new SetCardInfo("Aminatou, the Fateshifter", 37, Rarity.MYTHIC, mage.cards.a.AminatouTheFateShifter.class));
         cards.add(new SetCardInfo("Ancient Stone Idol", 53, Rarity.RARE, mage.cards.a.AncientStoneIdol.class));
         cards.add(new SetCardInfo("Arcane Sanctum", 232, Rarity.UNCOMMON, mage.cards.a.ArcaneSanctum.class));
         cards.add(new SetCardInfo("Archetype of Imagination", 81, Rarity.UNCOMMON, mage.cards.a.ArchetypeOfImagination.class));
diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java
index dd77793fc5..4130242ad7 100644
--- a/Mage/src/main/java/mage/cards/CardImpl.java
+++ b/Mage/src/main/java/mage/cards/CardImpl.java
@@ -1,9 +1,6 @@
 
 package mage.cards;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
 import mage.MageObject;
 import mage.MageObjectImpl;
 import mage.Mana;
@@ -45,6 +42,13 @@ import mage.util.SubTypeList;
 import mage.watchers.Watcher;
 import org.apache.log4j.Logger;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
 public abstract class CardImpl extends MageObjectImpl implements Card {
 
     private static final long serialVersionUID = 1L;