diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java
index 2850ae81954..2ae3081eefe 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeartbeatOfSpring.java
@@ -29,7 +29,7 @@ package mage.sets.championsofkamigawa;
 
 import java.util.UUID;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
@@ -49,7 +49,7 @@ public class HeartbeatOfSpring extends CardImpl {
         
         // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
                 SetTargetPointer.PERMANENT));
     }
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java
index e844d069cf6..e865494afa8 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaAncient.java
@@ -30,7 +30,7 @@ package mage.sets.dragonsmaze;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
@@ -55,7 +55,7 @@ public class ZhurTaaAncient extends CardImpl {
 
         // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
                 SetTargetPointer.PERMANENT));
     }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/ManaFlare.java b/Mage.Sets/src/mage/sets/fourthedition/ManaFlare.java
index ae0574d6ac2..5d876c7b705 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/ManaFlare.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/ManaFlare.java
@@ -29,7 +29,7 @@ package mage.sets.fourthedition;
 
 import java.util.UUID;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
@@ -48,7 +48,7 @@ public class ManaFlare extends CardImpl {
 
         // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
                 SetTargetPointer.PERMANENT));
     }
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java
index dbc335daec7..85bc5e7b0f5 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKarametra.java
@@ -29,7 +29,7 @@ package mage.sets.journeyintonyx;
 
 import java.util.UUID;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.abilities.keyword.FlashAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -53,7 +53,7 @@ public class DictateOfKarametra extends CardImpl {
         this.addAbility(FlashAbility.getInstance());
         // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
                 SetTargetPointer.PERMANENT));
         
diff --git a/Mage.Sets/src/mage/sets/judgment/MirarisWake.java b/Mage.Sets/src/mage/sets/judgment/MirarisWake.java
index 27cf5bff089..f10c861aa4d 100644
--- a/Mage.Sets/src/mage/sets/judgment/MirarisWake.java
+++ b/Mage.Sets/src/mage/sets/judgment/MirarisWake.java
@@ -30,7 +30,7 @@ package mage.sets.judgment;
 import java.util.UUID;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
@@ -57,7 +57,7 @@ public class MirarisWake extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1,Duration.WhileOnBattlefield)));
         // Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 new FilterControlledLandPermanent("you tap a land"),
                 SetTargetPointer.PERMANENT));
 
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
index 35d9f5ff184..56d44ab81ea 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
@@ -64,7 +64,7 @@ public class VorinclexVoiceOfHunger extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
         // Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 new FilterControlledLandPermanent("you tap a land"),
                 SetTargetPointer.PERMANENT));
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java b/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java
index daeed72c382..f59829a1d4f 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/KeeperOfProgenitus.java
@@ -30,7 +30,7 @@ package mage.sets.shardsofalara;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.TapForManaAllTriggeredManaAbility;
-import mage.abilities.effects.common.AddManaOfAnyColorTargetCanProduceEffect;
+import mage.abilities.effects.common.AddManaOfAnyTypeProducedEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
@@ -67,7 +67,7 @@ public class KeeperOfProgenitus extends CardImpl {
 
         // Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to his or her mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaOfAnyColorTargetCanProduceEffect(),
+                new AddManaOfAnyTypeProducedEffect(),
                 filter, SetTargetPointer.PERMANENT));
     }
 
diff --git a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorTargetCanProduceEffect.java b/Mage/src/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java
similarity index 83%
rename from Mage/src/mage/abilities/effects/common/AddManaOfAnyColorTargetCanProduceEffect.java
rename to Mage/src/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java
index 32c2dd833a1..cd3f1b5b39f 100644
--- a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorTargetCanProduceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java
@@ -29,12 +29,9 @@
 package mage.abilities.effects.common;
 
 import mage.Mana;
-import mage.abilities.Abilities;
 import mage.abilities.Ability;
-import mage.abilities.mana.ManaAbility;
 import mage.choices.Choice;
 import mage.choices.ChoiceImpl;
-import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -44,14 +41,14 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class AddManaOfAnyColorTargetCanProduceEffect extends ManaEffect {
+public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
 
-    public AddManaOfAnyColorTargetCanProduceEffect() {
+    public AddManaOfAnyTypeProducedEffect() {
         super();
         staticText = "that player adds one mana to his or her mana pool of any type that land produced";
     }
 
-    public AddManaOfAnyColorTargetCanProduceEffect(final AddManaOfAnyColorTargetCanProduceEffect effect) {
+    public AddManaOfAnyTypeProducedEffect(final AddManaOfAnyTypeProducedEffect effect) {
         super(effect);
     }
 
@@ -63,13 +60,7 @@ public class AddManaOfAnyColorTargetCanProduceEffect extends ManaEffect {
             if (targetController == null) {
                 return false;
             }
-            Abilities<ManaAbility> mana = permanent.getAbilities().getManaAbilities(Zone.BATTLEFIELD);
-            Mana types = new Mana();
-            for (ManaAbility ability : mana) {
-                for(Mana netMana: ability.getNetMana(game)) {
-                    types.add(netMana);
-                }                
-            }
+            Mana types = (Mana) this.getValue("mana");
             Choice choice = new ChoiceImpl(true);
             choice.setMessage("Pick the type of mana to produce");
             if (types.getBlack() > 0) {
@@ -129,14 +120,12 @@ public class AddManaOfAnyColorTargetCanProduceEffect extends ManaEffect {
     }
 
     @Override
-    public AddManaOfAnyColorTargetCanProduceEffect copy() {
-        return new AddManaOfAnyColorTargetCanProduceEffect(this);
+    public AddManaOfAnyTypeProducedEffect copy() {
+        return new AddManaOfAnyTypeProducedEffect(this);
     }
 
     @Override
     public Mana getMana(Game game, Ability source) {
         return null;
     }
-
-
 }