diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
index 9c3dacfdcb1..7549df116dc 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -312,8 +312,11 @@ public class AbilityManaPart implements java.io.Serializable {
                 continue;
             }
 
-            if (restriction.startsWith("CostContainsX")) {
-                if (sa.costHasManaX()) {
+            if (restriction.startsWith("CostContains")) {
+                if (restriction.endsWith("X") && sa.costHasManaX()) {
+                    return true;
+                }
+                if (restriction.endsWith("C") && sa.getPayCosts().hasManaCost() && sa.getPayCosts().getCostMana().getManaToPay().getGenericCost() > 0) {
                     return true;
                 }
                 continue;
@@ -338,6 +341,11 @@ public class AbilityManaPart implements java.io.Serializable {
                 return true;
             }
 
+            // the payment is for a resolving SA, currently no other restrictions would allow that
+            if (getSourceCard().getGame().getStack().getInstanceFromSpellAbility(sa.getRootAbility()) != null) {
+                return false;
+            }
+
             if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) {
                 return true;
             }
diff --git a/forge-gui/res/cardsfolder/e/eldrazi_temple.txt b/forge-gui/res/cardsfolder/e/eldrazi_temple.txt
index ec493089e24..4f9e9e7a30c 100644
--- a/forge-gui/res/cardsfolder/e/eldrazi_temple.txt
+++ b/forge-gui/res/cardsfolder/e/eldrazi_temple.txt
@@ -2,6 +2,6 @@ Name:Eldrazi Temple
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Spell.Eldrazi,Activated.Eldrazi+Colorless | SpellDescription$ Add {C}{C}. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Spell.Eldrazi+Colorless,Activated.Eldrazi+Colorless | SpellDescription$ Add {C}{C}. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.
 AI:RemoveDeck:Random
 Oracle:{T}: Add {C}.\n{T}: Add {C}{C}. Spend this mana only to cast colorless Eldrazi spells or activate abilities of colorless Eldrazi.