diff --git a/Mage/src/mage/ConditionalMana.java b/Mage/src/mage/ConditionalMana.java
index 9ddd04cf6ae..5146ca4d40b 100644
--- a/Mage/src/mage/ConditionalMana.java
+++ b/Mage/src/mage/ConditionalMana.java
@@ -47,7 +47,7 @@ public class ConditionalMana extends Mana implements Serializable {
     /**
      * Conditions that should be met (all or any depending on comparison scope) to allow spending {@link Mana} mana.
      */
-    private List<Condition> conditions = new ArrayList<Condition>();
+    private List<Condition> conditions = new ArrayList<>();
 
     /**
      * Text displayed as a description for conditional mana.
@@ -74,6 +74,7 @@ public class ConditionalMana extends Mana implements Serializable {
         conditions = conditionalMana.conditions;
         scope = conditionalMana.scope;
         staticText = conditionalMana.staticText;
+        manaProducerId = conditionalMana.manaProducerId;
     }
 
     public void addCondition(Condition condition) {
diff --git a/Mage/src/mage/abilities/effects/common/continious/CommanderManaReplacementEffect.java b/Mage/src/mage/abilities/effects/common/continious/CommanderManaReplacementEffect.java
index 5967eb7f55c..e3e8330d610 100644
--- a/Mage/src/mage/abilities/effects/common/continious/CommanderManaReplacementEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/CommanderManaReplacementEffect.java
@@ -81,7 +81,7 @@ public class CommanderManaReplacementEffect extends ReplacementEffectImpl {
 
     @Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-        Mana mana = ((ManaEvent) event).getMana();
+        Mana mana = ((ManaEvent) event).getMana().copy();
         if (mana.getBlack() > 0 && commanderMana.getBlack() == 0) {
             for (int i = 0; i < mana.getBlack(); i++) {
                 mana.addColorless();
@@ -112,6 +112,7 @@ public class CommanderManaReplacementEffect extends ReplacementEffectImpl {
             }
             mana.setWhite(0);
         }
+        ((ManaEvent) event).setMana(mana);
         return false;
     }
 
diff --git a/Mage/src/mage/abilities/mana/ManaAbility.java b/Mage/src/mage/abilities/mana/ManaAbility.java
index 3a0e60b679d..f258aa54df5 100644
--- a/Mage/src/mage/abilities/mana/ManaAbility.java
+++ b/Mage/src/mage/abilities/mana/ManaAbility.java
@@ -71,6 +71,6 @@ public abstract class ManaAbility extends ActivatedAbilityImpl {
     }
 
     public Mana getNetMana(Game game) {
-        return netMana.copy();
+        return netMana;
     }
 }
diff --git a/Mage/src/mage/game/events/ManaEvent.java b/Mage/src/mage/game/events/ManaEvent.java
index 43aed458e2a..13717c94dd8 100644
--- a/Mage/src/mage/game/events/ManaEvent.java
+++ b/Mage/src/mage/game/events/ManaEvent.java
@@ -48,4 +48,8 @@ public class ManaEvent extends GameEvent {
         return mana;
     }
 
+    public void setMana(Mana mana) {
+        this.mana = mana;
+    }
+
 }