diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp
index 2da274c4c..4262b0624 100644
--- a/projects/mtg/src/AIPlayerBaka.cpp
+++ b/projects/mtg/src/AIPlayerBaka.cpp
@@ -1681,10 +1681,16 @@ int AIPlayerBaka::selectMenuOption()
                 }
             }
             if(currentMenu)
-                for(unsigned int mk = 0;mk < currentMenu->abilities.size();mk++)
+                for (unsigned int mk = 0; mk < currentMenu->abilities.size(); mk++)
                 {
+                    if (dynamic_cast<AAWhatsX*>(currentMenu->abilities[0]))
+                    {
+                        int potent = manaPool->getConvertedCost();
+                        int aftercost = potent - currentMenu->abilities[0]->source->getManaCost()->getConvertedCost();
+                        return  aftercost;
+                    }
                     int checked = getEfficiency(currentMenu->abilities[mk]);
-                    if(checked > 60 && checked > checkedLast)
+                    if (checked > 60 && checked > checkedLast)
                     {
                         doThis = mk;
                         checkedLast = checked;
diff --git a/projects/mtg/src/Damage.cpp b/projects/mtg/src/Damage.cpp
index b5a94633c..17bd6b9bd 100644
--- a/projects/mtg/src/Damage.cpp
+++ b/projects/mtg/src/Damage.cpp
@@ -52,7 +52,10 @@ int Damage::resolve()
     damage = ev->damage->damage;
     target = ev->damage->target;
     if (!damage)
+    {
+        delete (e);
         return 0;
+    }
 
     //asorbing effects for cards controller-----------