diff --git a/src/forge/ComputerUtil.java b/src/forge/ComputerUtil.java
index f14d7dcd599..d31d49051b0 100644
--- a/src/forge/ComputerUtil.java
+++ b/src/forge/ComputerUtil.java
@@ -861,12 +861,8 @@ public class ComputerUtil
 	  return chooseExileFrom(Constant.Zone.Graveyard, type, activate, target, amount);
   }
   
-  static public CardList chooseExileFromTopType(String type, Card activate, Card target, int amount){
-	  return chooseExileFrom(Constant.Zone.Library, type, activate, target, amount);
-  }
-  
   static public CardList chooseExileFrom(String zone, String type, Card activate, Card target, int amount){
-	  CardList typeList = AllZoneUtil.getPlayerGraveyard(AllZone.ComputerPlayer);
+	  CardList typeList = AllZoneUtil.getCardsInZone(zone, AllZone.ComputerPlayer);
       typeList = typeList.getValidCards(type.split(","),activate.getController() ,activate);
 	  if (target != null && target.getController().isComputer() && typeList.contains(target))
 		  typeList.remove(target);	// don't exile the card we're pumping
diff --git a/src/forge/card/spellability/Cost_Payment.java b/src/forge/card/spellability/Cost_Payment.java
index c3995ad4a87..32355248316 100644
--- a/src/forge/card/spellability/Cost_Payment.java
+++ b/src/forge/card/spellability/Cost_Payment.java
@@ -555,7 +555,7 @@ public class Cost_Payment {
     		if (cost.getExileFromTopThis())
     			exileFromTopCard.add(card);
     		else
-    			exileFromTopCard = ComputerUtil.chooseExileFromTopType(cost.getExileFromTopType(), card, ability.getTargetCard(), cost.getExileFromTopAmount());
+    			exileFromTopCard = AllZoneUtil.getPlayerCardsInLibrary(AllZone.ComputerPlayer, cost.getExileFromTopAmount());
     		
 	    	if (exileFromTopCard.size() != cost.getExileFromTopAmount()){
 	    		System.out.println("Couldn't find a valid card to exile for: "+card.getName());