diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index 1bb38cdb467..bdf367c74e1 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -2880,7 +2880,7 @@ public class ComputerUtil {
         AiController aic = ((PlayerControllerAi) ai.getController()).getAi();
         Card targetSpellCard = null;
         for (Card c : options) {
-            if (withoutPayingManaCost && c.getManaCost() != null && c.getManaCost().getShardCount(ManaCostShard.X) > 0) {
+            if (withoutPayingManaCost && c.getManaCost() != null && c.getManaCost().countX() > 0) {
                 // The AI will otherwise cheat with the mana payment, announcing X > 0 for spells like Heat Ray when replaying them
                 // without paying their mana cost.
                 continue;
diff --git a/forge-core/src/main/java/forge/card/mana/ManaCost.java b/forge-core/src/main/java/forge/card/mana/ManaCost.java
index 51611a48d18..34a0387b61b 100644
--- a/forge-core/src/main/java/forge/card/mana/ManaCost.java
+++ b/forge-core/src/main/java/forge/card/mana/ManaCost.java
@@ -345,13 +345,7 @@ public final class ManaCost implements Comparable<ManaCost>, Iterable<ManaCostSh
      * @return
      */
     public int countX() {
-        int iX = 0;
-        for (ManaCostShard shard : shards) {
-            if (shard == ManaCostShard.X) {
-                iX++;
-            }
-        }
-        return iX;
+        return getShardCount(ManaCostShard.X);
     }
 
     /**
diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 445a3bf6956..16e67183153 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
 
 import forge.card.ColorSet;
 import forge.card.MagicColor;
+import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
 import forge.game.Direction;
 import forge.game.EvenOdd;
@@ -1389,8 +1390,8 @@ public class CardProperty {
                 return false;
             }
         } else if (property.startsWith("hasXCost")) {
-            SpellAbility sa1 = card.getFirstSpellAbility();
-            if (sa1 != null && !sa1.costHasManaX()) {
+            ManaCost cost = card.getManaCost();
+            if (cost == null || cost.countX() <= 0) {
                 return false;
             }
         } else if (property.startsWith("suspended")) {
diff --git a/forge-game/src/main/java/forge/game/cost/CostPartMana.java b/forge-game/src/main/java/forge/game/cost/CostPartMana.java
index 66fdad8ce3e..a4b28f34dee 100644
--- a/forge-game/src/main/java/forge/game/cost/CostPartMana.java
+++ b/forge-game/src/main/java/forge/game/cost/CostPartMana.java
@@ -18,7 +18,6 @@
 package forge.game.cost;
 
 import forge.card.mana.ManaCost;
-import forge.card.mana.ManaCostShard;
 import forge.game.mana.ManaConversionMatrix;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
@@ -77,7 +76,7 @@ public class CostPartMana extends CostPart {
     }
 
     public final int getAmountOfX() {
-        return this.cost.getShardCount(ManaCostShard.X);
+        return this.cost.countX();
     }
 
     /**