diff --git a/res/cardsfolder/ashen_skin_zubera.txt b/res/cardsfolder/ashen_skin_zubera.txt
index d732da43060..0ab9feb47d5 100644
--- a/res/cardsfolder/ashen_skin_zubera.txt
+++ b/res/cardsfolder/ashen_skin_zubera.txt
@@ -4,7 +4,7 @@ Types:Creature Zubera Spirit
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target opponent discards a card for each Zubera put into a graveyard from the battlefield this turn.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Opponent | NumCards$ X | Mode$ TgtChoose
-SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.Zubera
+SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera
 PT:1/2
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80509.jpg
diff --git a/res/cardsfolder/dripping_tongue_zubera.txt b/res/cardsfolder/dripping_tongue_zubera.txt
index 87fe8e1cd34..c375857a1c3 100644
--- a/res/cardsfolder/dripping_tongue_zubera.txt
+++ b/res/cardsfolder/dripping_tongue_zubera.txt
@@ -4,7 +4,7 @@ Types:Creature Zubera Spirit
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 1/1 colorless Spirit creature token onto the battlefield for each Zubera put into a graveyard from the battlefield this turn.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenColors$ Colorless | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenAmount$ X
-SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.Zubera
+SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera
 PT:1/2
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80511.jpg
diff --git a/res/cardsfolder/ember_fist_zubera.txt b/res/cardsfolder/ember_fist_zubera.txt
index bb53337c264..df31c337468 100644
--- a/res/cardsfolder/ember_fist_zubera.txt
+++ b/res/cardsfolder/ember_fist_zubera.txt
@@ -4,7 +4,7 @@ Types:Creature Zubera Spirit
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, it deals damage to target creature or player equal to the number of Zubera put into all graveyards from the battlefield this turn.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ X
-SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.Zubera
+SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera
 PT:1/2
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80508.jpg
diff --git a/res/cardsfolder/floating_dream_zubera.txt b/res/cardsfolder/floating_dream_zubera.txt
index 8a7fe43a615..1c34cb1bb44 100644
--- a/res/cardsfolder/floating_dream_zubera.txt
+++ b/res/cardsfolder/floating_dream_zubera.txt
@@ -4,7 +4,7 @@ Types:Creature Zubera Spirit
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card for each Zubera put into a graveyard from the battlefield this turn.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X
-SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.Zubera
+SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera
 PT:1/2
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80507.jpg
diff --git a/res/cardsfolder/silent_chant_zubera.txt b/res/cardsfolder/silent_chant_zubera.txt
index 715ce7c777d..b16b98727c4 100644
--- a/res/cardsfolder/silent_chant_zubera.txt
+++ b/res/cardsfolder/silent_chant_zubera.txt
@@ -4,7 +4,7 @@ Types:Creature Zubera Spirit
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you gain 2 life for each Zubera put into a graveyard from the battlefield this turn.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X
-SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Creature.Zubera/Double
+SVar:X:Count$ThisTurnEntered Graveyard from Battlefield Card.Zubera/Double
 PT:1/2
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80510.jpg
diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java
index 1b7254018fd..9c15c85970d 100644
--- a/src/forge/card/cardFactory/CardFactory.java
+++ b/src/forge/card/cardFactory/CardFactory.java
@@ -183,6 +183,8 @@ public class CardFactory implements NewConstants {
         out.setCurSetCode(in.getCurSetCode());
         out.setImageFilename(in.getImageFilename());
         out.setAllTriggeringObjects(in.getAllTriggeringObjects());
+        out.setEquipping(in.getEquipping());
+        out.setEquippedBy(in.getEquippedBy());
         return out;
     	
     }