diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java b/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
index 26564b7d7fd..b4a658c579c 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java
@@ -35,7 +35,10 @@ public class ReplaceProduceMana extends ReplacementEffect {
         if (!matchesValidParam("ValidCard", runParams.get(AbilityKey.Affected))) {
             return false;
         }
-        if (!matchesValidParam("ValidPlayer", runParams.get(AbilityKey.Activator))) {
+        if (!matchesValidParam("ValidPlayer", runParams.get(AbilityKey.Player))) {
+            return false;
+        }
+        if (!matchesValidParam("ValidActivator", runParams.get(AbilityKey.Activator))) {
             return false;
         }
         if (!matchesValidParam("ValidAbility", runParams.get(AbilityKey.AbilityMana))) {
diff --git a/forge-gui/res/cardsfolder/d/deep_water.txt b/forge-gui/res/cardsfolder/d/deep_water.txt
index 8c300df12bd..1048cd1c09e 100644
--- a/forge-gui/res/cardsfolder/d/deep_water.txt
+++ b/forge-gui/res/cardsfolder/d/deep_water.txt
@@ -2,7 +2,7 @@ Name:Deep Water
 ManaCost:U U
 Types:Enchantment
 A:AB$ Effect | Cost$ U | ReplacementEffects$ ReplaceU | SpellDescription$ Until end of turn, if you tap a land you control for mana, it produces {U} instead of any other type.
-SVar:ReplaceU:Event$ ProduceMana | ActiveZones$ Command | ValidPlayer$ You | ValidCard$ Land.YouCtrl | ValidAbility$ Activated.hasTapCost | ReplaceWith$ ProduceU | Description$ If you tap a land you control for mana, it produces U instead of any other type.
+SVar:ReplaceU:Event$ ProduceMana | ActiveZones$ Command | ValidActivator$ You | ValidCard$ Land.YouCtrl | ValidAbility$ Activated.hasTapCost | ReplaceWith$ ProduceU | Description$ If you tap a land you control for mana, it produces U instead of any other type.
 SVar:ProduceU:DB$ ReplaceMana | ReplaceType$ U
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/h/harvest_mage.txt b/forge-gui/res/cardsfolder/h/harvest_mage.txt
index 9a808e30a70..1f7b9053a52 100644
--- a/forge-gui/res/cardsfolder/h/harvest_mage.txt
+++ b/forge-gui/res/cardsfolder/h/harvest_mage.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Human Spellshaper
 PT:1/1
 A:AB$ Effect | Cost$ G T Discard<1/Card> | ReplacementEffects$ HarvestReplacement | AILogic$ Never | Stackable$ False | SpellDescription$ Until end of turn, if you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
-SVar:HarvestReplacement:Event$ ProduceMana | ActiveZones$ Command | ValidPlayer$ You | ValidCard$ Land | ValidAbility$ Activated.hasTapCost | ReplaceWith$ HarvestProduce | Description$ If you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
+SVar:HarvestReplacement:Event$ ProduceMana | ActiveZones$ Command | ValidActivator$ You | ValidCard$ Land | ValidAbility$ Activated.hasTapCost | ReplaceWith$ HarvestProduce | Description$ If you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
 SVar:HarvestProduce:DB$ ReplaceMana | ReplaceMana$ Any
 AI:RemoveDeck:All
 SVar:NonStackingEffect:True
diff --git a/forge-gui/res/cardsfolder/m/mana_reflection.txt b/forge-gui/res/cardsfolder/m/mana_reflection.txt
index 04ebe0d17df..1bc8429723d 100644
--- a/forge-gui/res/cardsfolder/m/mana_reflection.txt
+++ b/forge-gui/res/cardsfolder/m/mana_reflection.txt
@@ -1,6 +1,6 @@
 Name:Mana Reflection
 ManaCost:4 G G
 Types:Enchantment
-R:Event$ ProduceMana | ActiveZones$ Battlefield | ValidPlayer$ You | ValidCard$ Permanent | ValidAbility$ Activated.hasTapCost | ReplaceWith$ ProduceTwice | Description$ If you tap a permanent for mana, it produces twice as much of that mana instead.
+R:Event$ ProduceMana | ActiveZones$ Battlefield | ValidActivator$ You | ValidCard$ Permanent | ValidAbility$ Activated.hasTapCost | ReplaceWith$ ProduceTwice | Description$ If you tap a permanent for mana, it produces twice as much of that mana instead.
 SVar:ProduceTwice:DB$ ReplaceMana | ReplaceAmount$ 2
 Oracle:If you tap a permanent for mana, it produces twice as much of that mana instead.
diff --git a/forge-gui/res/cardsfolder/n/nyxbloom_ancient.txt b/forge-gui/res/cardsfolder/n/nyxbloom_ancient.txt
index 24557a450d6..1537e062d68 100755
--- a/forge-gui/res/cardsfolder/n/nyxbloom_ancient.txt
+++ b/forge-gui/res/cardsfolder/n/nyxbloom_ancient.txt
@@ -3,6 +3,6 @@ ManaCost:4 G G G
 Types:Enchantment Creature Elemental
 PT:5/5
 K:Trample
-R:Event$ ProduceMana | ActiveZones$ Battlefield | ValidPlayer$ You | ValidCard$ Permanent | ValidAbility$ Activated.hasTapCost | ReplaceWith$ ProduceThrice | Description$ If you tap a permanent for mana, it produces three times as much of that mana instead.
+R:Event$ ProduceMana | ActiveZones$ Battlefield | ValidActivator$ You | ValidCard$ Permanent | ValidAbility$ Activated.hasTapCost | ReplaceWith$ ProduceThrice | Description$ If you tap a permanent for mana, it produces three times as much of that mana instead.
 SVar:ProduceThrice:DB$ ReplaceMana | ReplaceAmount$ 3
 Oracle:Trample\nIf you tap a permanent for mana, it produces three times as much of that mana instead.