diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCrewValue.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCrewValue.java
index 5467ba0f825..42d49070d82 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCrewValue.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCrewValue.java
@@ -54,6 +54,9 @@ public class StaticAbilityCrewValue {
                 if (!stAb.getParam("Mode").equals(MODE) || stAb.isSuppressed() || !stAb.checkConditions()) {
                     continue;
                 }
+                if (!stAb.matchesValidParam("ValidCard", card)) {
+                    continue;
+                }
                 int t = Integer.parseInt(stAb.getParam("Value"));
                 i = i + t;
             }
diff --git a/forge-gui/res/cardsfolder/g/giant_ox.txt b/forge-gui/res/cardsfolder/g/giant_ox.txt
index 4f2b3894a49..e4a4b84c8f4 100644
--- a/forge-gui/res/cardsfolder/g/giant_ox.txt
+++ b/forge-gui/res/cardsfolder/g/giant_ox.txt
@@ -2,6 +2,6 @@ Name:Giant Ox
 ManaCost:1 W
 Types:Creature Ox
 PT:0/6
-S:Mode$ CrewValue | Affected$ Card.Self | Value$ Toughness | Description$ CARDNAME crews Vehicles using its toughness rather than its power.
+S:Mode$ CrewValue | ValidCard$ Card.Self | Value$ Toughness | Description$ CARDNAME crews Vehicles using its toughness rather than its power.
 DeckHints:Type$Vehicle
 Oracle:Giant Ox crews Vehicles using its toughness rather than its power.
diff --git a/forge-gui/res/cardsfolder/upcoming/hotshot_mechanic.txt b/forge-gui/res/cardsfolder/upcoming/hotshot_mechanic.txt
index 757c0e5336f..5ff15cd1892 100644
--- a/forge-gui/res/cardsfolder/upcoming/hotshot_mechanic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hotshot_mechanic.txt
@@ -2,6 +2,6 @@ Name:Hotshot Mechanic
 ManaCost:W
 Types:Artifact Creature Fox Pilot
 PT:2/1
-S:Mode$ CrewValue | Affected$ Card.Self | Value$ 2 | Description$ CARDNAME crews Vehicles as though its power were 2 greater.
+S:Mode$ CrewValue | ValidCard$ Card.Self | Value$ 2 | Description$ CARDNAME crews Vehicles as though its power were 2 greater.
 DeckHints:Type$Vehicle
 Oracle:Hotshot Mechanic crews Vehicles as though its power were 2 greater.
diff --git a/forge-gui/res/tokenscripts/c_1_1_pilot_crewbuff.txt b/forge-gui/res/tokenscripts/c_1_1_pilot_crewbuff.txt
index 5a63a40320a..fe3b1dde6b4 100644
--- a/forge-gui/res/tokenscripts/c_1_1_pilot_crewbuff.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_pilot_crewbuff.txt
@@ -2,5 +2,5 @@ Name:Pilot Token
 ManaCost:no cost
 Types:Creature Pilot
 PT:1/1
-S:Mode$ CrewValue | Affected$ Card.Self | Value$ 2 | Description$ This creature crews Vehicles as though its power were 2 greater.
+S:Mode$ CrewValue | ValidCard$ Card.Self | Value$ 2 | Description$ This creature crews Vehicles as though its power were 2 greater.
 Oracle:This creature crews Vehicles as though its power were 2 greater.