diff --git a/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java b/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java
index ef14823483b..6a4c143e106 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Shatterstorm.java
@@ -28,10 +28,10 @@
 package mage.sets.fifthedition;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.abilities.effects.common.DestroyAllEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.filter.common.FilterArtifactPermanent;
 
 /**
@@ -44,7 +44,6 @@ public class Shatterstorm extends CardImpl {
         super(ownerId, 266, "Shatterstorm", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}{R}");
         this.expansionSetCode = "5ED";
 
-
         // Destroy all artifacts. They can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterArtifactPermanent("artifacts"), true));
     }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/JinxedRingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/JinxedRingTest.java
new file mode 100644
index 00000000000..4276342f2a9
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/JinxedRingTest.java
@@ -0,0 +1,103 @@
+/*
+ *  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.triggers.dies;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class JinxedRingTest extends CardTestPlayerBase {
+
+    @Test
+    public void testShatterstorm() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
+        // Destroy all artifacts. They can't be regenerated.
+        addCard(Zone.HAND, playerA, "Shatterstorm", 1); // Sorcery - {2}{R}{R}
+        // Whenever a nontoken permanent is put into your graveyard from the battlefield, Jinxed Ring deals 1 damage to you.
+        // Sacrifice a creature: Target opponent gains control of Jinxed Ring.
+        addCard(Zone.BATTLEFIELD, playerA, "Jinxed Ring", 1);
+
+        // Bonded Construct can't attack alone.
+        addCard(Zone.BATTLEFIELD, playerA, "Bonded Construct", 2); // Artifact Creature - Construct 2/1
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shatterstorm");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Shatterstorm", 1);
+        assertGraveyardCount(playerA, "Jinxed Ring", 1);
+        assertGraveyardCount(playerA, "Bonded Construct", 2);
+        assertLife(playerA, 17);
+        assertLife(playerB, 20);
+
+    }
+
+    /**
+     * Card works fine on destroying individual things, but after I gave it to
+     * my opponent, when I cast Shatterstorm there were no triggers. Maybe a
+     * problem because Jinxed Ring goes to my graveyard and other permanents go
+     * to their owner's graveyards, while Jinxed Ring looks at permanent's
+     * entering "your graveyard."
+     */
+    @Test
+    public void testShatterstormControlledByOpponent() {
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
+        // Exchange control of target artifact or creature and another target permanent that shares one of those types with it.
+        addCard(Zone.HAND, playerA, "Legerdemain", 1); // Sorcery - {2}{U}{U}
+        // Destroy all artifacts. They can't be regenerated.
+        addCard(Zone.HAND, playerA, "Shatterstorm", 1); // Sorcery - {2}{R}{R}
+        // Whenever a nontoken permanent is put into your graveyard from the battlefield, Jinxed Ring deals 1 damage to you.
+        // Sacrifice a creature: Target opponent gains control of Jinxed Ring.
+        addCard(Zone.BATTLEFIELD, playerA, "Jinxed Ring", 1);
+
+        // Bonded Construct can't attack alone.
+        addCard(Zone.BATTLEFIELD, playerB, "Bonded Construct", 2); // Artifact Creature - Construct 2/1
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Legerdemain", "Jinxed Ring^Bonded Construct");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shatterstorm");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, "Legerdemain", 1);
+        assertGraveyardCount(playerA, "Shatterstorm", 1);
+        assertGraveyardCount(playerA, "Jinxed Ring", 1);
+        assertGraveyardCount(playerB, "Bonded Construct", 2);
+        assertLife(playerA, 20);
+        assertLife(playerB, 18);
+
+    }
+
+}
diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java
index 2a9d07b1c99..0ea57904eaa 100644
--- a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java
+++ b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java
@@ -42,6 +42,7 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
+import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.game.stack.Spell;
 
@@ -94,8 +95,12 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
             if (event == null || !game.getContinuousEffects().preventedByRuleModification(event, ability, game, false)) {
                 if (object != null) {
                     boolean controllerSet = false;
-                    if (!ability.getZone().equals(Zone.COMMAND) && event != null && event.getTargetId() != null && event.getTargetId().equals(ability.getSourceId())
-                            && (event.getType().equals(EventType.ZONE_CHANGE) || event.getType().equals(EventType.DESTROYED_PERMANENT) || event.getType().equals(EventType.SACRIFICED_PERMANENT))) {
+                    if (!ability.getZone().equals(Zone.COMMAND) && event != null
+                            && event.getTargetId() != null // && event.getTargetId().equals(ability.getSourceId())
+                            && ((event.getType().equals(EventType.ZONE_CHANGE) && ((ZoneChangeEvent) event).getFromZone().equals(Zone.BATTLEFIELD))
+                            || event.getType().equals(EventType.DESTROYED_PERMANENT)
+                            || event.getType().equals(EventType.SACRIFICED_PERMANENT))
+                            && game.getLKI().get(Zone.BATTLEFIELD) != null && game.getLKI().get(Zone.BATTLEFIELD).containsKey(ability.getSourceId())) {
                         // need to check if object was face down for dies and destroy events because the ability triggers in the new zone, zone counter -1 is used
                         Permanent permanent = (Permanent) game.getLastKnownInformation(ability.getSourceId(), Zone.BATTLEFIELD, ability.getSourceObjectZoneChangeCounter() - 1);
                         if (permanent != null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java
index 729dbfe325f..a993d40c376 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java
@@ -1,41 +1,44 @@
 /*
-* 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.
-*/
-
+ * 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 mage.abilities.effects.common.continuous;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
-import mage.abilities.Ability;
-import mage.abilities.Mode;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
@@ -70,8 +73,8 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl {
         this.rule = effect.rule;
         this.withSource = effect.withSource;
         this.withSecondTarget = effect.withSecondTarget;
-        this.lockedControllers = new HashMap<UUID, UUID>(effect.lockedControllers);
-        this.zoneChangeCounter = new HashMap<UUID, Integer>(effect.zoneChangeCounter);
+        this.lockedControllers = new HashMap<>(effect.lockedControllers);
+        this.zoneChangeCounter = new HashMap<>(effect.zoneChangeCounter);
     }
 
     @Override
@@ -81,7 +84,7 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl {
 
     @Override
     public boolean isInactive(Ability source, Game game) {
-       return isDiscarded();
+        return isDiscarded();
     }
 
     @Override
@@ -125,7 +128,7 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl {
     @Override
     public boolean apply(Game game, Ability source) {
         Set<UUID> toDelete = new HashSet<>();
-        for (Map.Entry<UUID, Integer> entry: zoneChangeCounter.entrySet()) {
+        for (Map.Entry<UUID, Integer> entry : zoneChangeCounter.entrySet()) {
             Permanent permanent = game.getPermanent(entry.getKey());
             if (permanent == null || permanent.getZoneChangeCounter(game) != entry.getValue()) {
                 // controll effect cease if the same permanent is no longer on the battlefield
@@ -136,7 +139,7 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl {
             permanent.getAbilities().setControllerId(lockedControllers.get(permanent.getId()));
         }
         if (!toDelete.isEmpty()) {
-            for(UUID uuid: toDelete) {
+            for (UUID uuid : toDelete) {
                 zoneChangeCounter.remove(uuid);
             }
             if (zoneChangeCounter.isEmpty()) {
diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
index b1f15c03398..87c5abbdff9 100644
--- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java
@@ -627,7 +627,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
 
             this.abilities.setControllerId(controllerId);
             game.getContinuousEffects().setController(objectId, controllerId);
-
+            // the controller of triggered abilites is always set/checked before the abilities triggers so not needed here
             game.fireEvent(new GameEvent(EventType.LOST_CONTROL, objectId, objectId, beforeResetControllerId));
             game.fireEvent(new GameEvent(EventType.GAINED_CONTROL, objectId, objectId, controllerId));