diff --git a/Mage.Sets/src/mage/sets/MagicOrigins.java b/Mage.Sets/src/mage/sets/MagicOrigins.java
index cc4c952414..d9d75e78dd 100644
--- a/Mage.Sets/src/mage/sets/MagicOrigins.java
+++ b/Mage.Sets/src/mage/sets/MagicOrigins.java
@@ -51,11 +51,11 @@ public class MagicOrigins extends ExpansionSet {
         this.numBoosterUncommon = 3;
         this.numBoosterRare = 1;
         this.ratioBoosterMythic = 8;
-        /* There are 15 additional cards, numbered 270–284, that don't appear in Magic 
-           2015 booster packs. These are reprints from earlier sets that are present in
-           some supplemental products, including sample decks and the Deck Builder's Toolkit.
-           These additional cards have a Magic 2015 expansion symbol and are legal in all
-           formats in which Magic 2015 is legal. */
+        /* There are additional cards, numbered 273–288, that don't appear in Magic
+         Origin booster packs. These are reprints from earlier sets that are present in
+         some supplemental products, including sample decks and the Deck Builder's Toolkit.
+         These additional cards have a Magic Origin expansion symbol and are legal in all
+         formats in which Magic Origins is legal. */
         this.maxCardNumberInBooster = 272;
     }
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EnsoulArtifactTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EnsoulArtifactTest.java
new file mode 100644
index 0000000000..666bc718b5
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/EnsoulArtifactTest.java
@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.continuous;
+
+import mage.abilities.keyword.IndestructibleAbility;
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class EnsoulArtifactTest extends CardTestPlayerBase {
+
+    /**
+     * Tests boost disappeared after creature died
+     */
+    @Test
+    public void testBoostWithUndying() {
+        addCard(Zone.BATTLEFIELD, playerA, "Darksteel Citadel", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
+
+        // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
+        addCard(Zone.HAND, playerA, "Ensoul Artifact");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ensoul Artifact", "Darksteel Citadel");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertAbility(playerA, "Darksteel Citadel", IndestructibleAbility.getInstance(), true);
+        assertPowerToughness(playerA, "Darksteel Citadel", 5, 5);
+    }
+
+}
diff --git a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java
index cf5a907365..1658b00fc8 100644
--- a/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java
@@ -155,14 +155,9 @@ public class BecomesCreatureAttachedEffect extends ContinuousEffectImpl {
                         break;
                     case PTChangingEffects_7:
                         if (sublayer == SubLayer.SetPT_7b) {
-                            switch (loseType) {
-                                case ALL:
-                                case ALL_BUT_COLOR:
-                                case ABILITIES_AND_PT:
-                                    permanent.getPower().setValue(token.getPower().getValue());
-                                    permanent.getToughness().setValue(token.getToughness().getValue());
-                                    break;
-                            }
+                            permanent.getPower().setValue(token.getPower().getValue());
+                            permanent.getToughness().setValue(token.getToughness().getValue());
+                            break;
                         }
                 }
             }