diff --git a/src/main/java/forge/card/spellability/AbilityManaPart.java b/src/main/java/forge/card/spellability/AbilityManaPart.java
index 8b1fb95442b..bb3e7410931 100644
--- a/src/main/java/forge/card/spellability/AbilityManaPart.java
+++ b/src/main/java/forge/card/spellability/AbilityManaPart.java
@@ -23,7 +23,6 @@ import java.util.Map;
 
 import forge.Card;
 import forge.Singletons;
-import forge.card.cost.Cost;
 import forge.card.mana.Mana;
 import forge.card.mana.ManaPool;
 import forge.card.trigger.TriggerType;
@@ -55,8 +54,6 @@ public class AbilityManaPart implements java.io.Serializable {
 
     private final transient Card sourceCard;
 
-    private transient Cost cost;
-
     // Spells paid with this mana spell can't be countered.
     private boolean cannotCounterSpell;
 
@@ -408,13 +405,7 @@ public class AbilityManaPart implements java.io.Serializable {
 
         final AbilityManaPart abm = (AbilityManaPart) o;
 
-//        if (abm.getType() != this.getType()) {
-//            return false;
-//        }
-
-        return cost.equals(abm.cost) && sourceCard.equals(abm.sourceCard);
-
-//        return abm.toUnsuppressedString().equals(this.toUnsuppressedString());
+        return sourceCard.equals(abm.sourceCard) && origProduced.equals(abm.getOrigProduced());
     }
 
     /** {@inheritDoc} */
diff --git a/src/main/java/forge/game/zone/Zone.java b/src/main/java/forge/game/zone/Zone.java
index dcad9f959d4..e782b287270 100644
--- a/src/main/java/forge/game/zone/Zone.java
+++ b/src/main/java/forge/game/zone/Zone.java
@@ -43,12 +43,12 @@ public class Zone extends MyObservable implements IZone, Observer, java.io.Seria
     private static final long serialVersionUID = -5687652485777639176L;
 
     /** The cards. */
-    protected final List<Card> cardList = new ArrayList<Card>();
-    protected final List<Card> roCardList;
+    protected transient final List<Card> cardList = new ArrayList<Card>();
+    protected transient final List<Card> roCardList;
     protected final ZoneType zoneName;
     protected boolean update = true;
 
-    protected final List<Card> cardsAddedThisTurn = new ArrayList<Card>();
+    protected transient final List<Card> cardsAddedThisTurn = new ArrayList<Card>();
     protected final ArrayList<ZoneType> cardsAddedThisTurnSource = new ArrayList<ZoneType>();