diff --git a/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java b/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java
index 792f5b9615..e97648f9e2 100644
--- a/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java
+++ b/Mage/src/mage/abilities/dynamicvalue/common/EquipmentAttachedCount.java
@@ -58,19 +58,15 @@ public class EquipmentAttachedCount implements DynamicValue {
     @Override
     public int calculate(Game game, Ability source) {
         int count = 0;
-        Permanent equipment = game.getPermanent(source.getSourceId());
-        if (equipment != null) {
-            Permanent permanent = game.getPermanent(equipment.getAttachedTo());
-            if (permanent != null) {
+        Permanent permanent = game.getPermanent(source.getSourceId()); // don't change this - may affect other cards
+        if (permanent != null) {
             List<UUID> attachments = permanent.getAttachments();
-                for (UUID attachmentId : attachments) {
-                    Permanent attached = game.getPermanent(attachmentId);
-                    if (attached != null && attached.getSubtype().contains("Equipment")) {
-                        count++;
-                    }
+            for (UUID attachmentId : attachments) {
+                Permanent attached = game.getPermanent(attachmentId);
+                if (attached != null && attached.getSubtype().contains("Equipment")) {
+                    count++;
                 }
             }
-
         }
         return amount * count;
     }
diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
index f4208fd3f5..b5a3c4b461 100644
--- a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
@@ -62,7 +62,7 @@ public class CreateTokenEffect extends OneShotEffect<CreateTokenEffect> {
 
     public CreateTokenEffect(final CreateTokenEffect effect) {
         super(effect);
-        this.amount = effect.amount;
+        this.amount = effect.amount.clone();
         this.token = effect.token.copy();
     }