diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryBond.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryBond.java
index 86d3bcaa7b1..3d6c1b0bf6a 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryBond.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryBond.java
@@ -342,7 +342,7 @@ public final class AbilityFactoryBond {
             }
         } else {
             // TODO - Pick best creature instead of just the first on the list
-            partner = cards.get(0);
+            partner = CardFactoryUtil.getBestCreatureAI(cards);
         }
 
         // pair choices together
diff --git a/src/main/java/forge/game/limited/BoosterDraftAI.java b/src/main/java/forge/game/limited/BoosterDraftAI.java
index 54d1bd78c45..7ae286cb4a3 100644
--- a/src/main/java/forge/game/limited/BoosterDraftAI.java
+++ b/src/main/java/forge/game/limited/BoosterDraftAI.java
@@ -23,8 +23,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.TreeMap;
 
-import org.apache.commons.lang3.tuple.Pair;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;