diff --git a/src/main/java/forge/card/ability/effects/ManaEffect.java b/src/main/java/forge/card/ability/effects/ManaEffect.java
index 8a392263d02..35a58ba918f 100644
--- a/src/main/java/forge/card/ability/effects/ManaEffect.java
+++ b/src/main/java/forge/card/ability/effects/ManaEffect.java
@@ -28,10 +28,6 @@ public class ManaEffect extends SpellAbilityEffect {
         final Card card = sa.getSourceCard();
 
         AbilityManaPart abMana = sa.getManaPart();
-        //if (!AbilityFactory.checkConditional(sa)) {
-        //    resolveDrawback(sa);
-        //    return;
-        //}
 
         // Spells are not undoable
         sa.setUndoable(sa.isAbility() && sa.isUndoable());
diff --git a/src/main/java/forge/game/ai/ComputerUtilMana.java b/src/main/java/forge/game/ai/ComputerUtilMana.java
index aee38aa572e..9c238a5dac8 100644
--- a/src/main/java/forge/game/ai/ComputerUtilMana.java
+++ b/src/main/java/forge/game/ai/ComputerUtilMana.java
@@ -138,6 +138,11 @@ public class ComputerUtilMana {
                 for (final SpellAbility ma : saList) { 
                     if(ma.getSourceCard() == sa.getSourceCard())
                         continue;
+                    
+                    final String typeRes = cost.getSourceRestriction();
+                    if( StringUtils.isNotBlank(typeRes) && !ma.getSourceCard().isType(typeRes))
+                        continue;
+
                     if( canPayShardWithSpellAbility(toPay, ai, ma, sa, checkPlayable || !test ) ) {
                         saPayment = ma;
                         break;
@@ -461,9 +466,14 @@ public class ComputerUtilMana {
      * @return ManaCost
      */
     private static ManaCostBeingPaid calculateManaCost(final SpellAbility sa, final boolean test, final int extraMana) {
-        final ManaCost mana = sa.getPayCosts() != null ? sa.getPayCosts().getTotalMana() : ManaCost.NO_COST;
+        Cost payCosts = sa.getPayCosts();
+        final ManaCost mana = payCosts != null ? payCosts.getTotalMana() : ManaCost.NO_COST;
     
-        ManaCostBeingPaid cost = new ManaCostBeingPaid(mana);
+        String restriction = null;
+        if (payCosts != null && payCosts.getCostMana() != null) {
+            restriction = payCosts.getCostMana().getRestiction();
+        }
+        ManaCostBeingPaid cost = new ManaCostBeingPaid(mana, restriction);
         cost.applySpellCostChange(sa);
     
         final Card card = sa.getSourceCard();