diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
index 6ee0e53f6e5..3584bb27e32 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
@@ -39,8 +39,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
             return true;
         } else if (aiLogic.startsWith("Fabricate")) {
             return true;
-        } else if ("Pump".equals(aiLogic)) {
-            // or is that more generic?
+        } else if ("Pump".equals(aiLogic) || "BestOption".equals(aiLogic)) {
             for (AbilitySub sb : sa.getAdditionalAbilityList("Choices")) {
                 if (SpellApiToAi.Converter.get(sb.getApi()).canPlayAIWithSubs(ai, sb)) {
                     return true;
@@ -324,7 +323,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
 
             int bestGuessDamage = totalCMC * 3 / revealedCards.size();
             return life <= bestGuessDamage ? spells.get(0) : spells.get(1);
-        } else if ("Pump".equals(logic)) {
+        } else if ("Pump".equals(logic) || "BestOption".equals(logic)) {
             List<SpellAbility> filtered = Lists.newArrayList();
             // filter first for the spells which can be done
             for (SpellAbility sp : spells) {
diff --git a/forge-gui/res/cardsfolder/c/catastrophe.txt b/forge-gui/res/cardsfolder/c/catastrophe.txt
index b8ae33c38cf..c43ab2a7ac4 100644
--- a/forge-gui/res/cardsfolder/c/catastrophe.txt
+++ b/forge-gui/res/cardsfolder/c/catastrophe.txt
@@ -1,7 +1,7 @@
 Name:Catastrophe
 ManaCost:4 W W
 Types:Sorcery
-A:SP$ GenericChoice | Cost$ 4 W W | Choices$ DBKillLand,DBKillCreatures | Defined$ You | AILogic$ Pump | StackDescription$ SpellDescription | SpellDescription$ Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
+A:SP$ GenericChoice | Cost$ 4 W W | Choices$ DBKillLand,DBKillCreatures | Defined$ You | AILogic$ BestOption | StackDescription$ SpellDescription | SpellDescription$ Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
 SVar:DBKillLand:DB$ DestroyAll | ValidCards$ Land | SpellDescription$ Destroy all lands.
 SVar:DBKillCreatures:DB$ DestroyAll | ValidCards$ Creature | NoRegen$ True | SpellDescription$ Destroy all creatures. They can't be regenerated.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catastrophe.jpg