diff --git a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java
index e2d46fc138a..342a0cd4108 100644
--- a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java
+++ b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java
@@ -37,9 +37,9 @@ import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondit
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect;
 import mage.abilities.effects.common.continuous.GainControlTargetEffect;
-import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -62,7 +62,7 @@ import mage.target.targetpointer.FixedTarget;
 public class MeriekeRiBerit extends CardImpl {
 
     public MeriekeRiBerit(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{U}{B}");
         this.supertype.add("Legendary");
         this.subtype.add("Human");
         this.power = new MageInt(1);
@@ -97,7 +97,7 @@ class MeriekeRiBeritCreateDelayedTriggerEffect extends OneShotEffect {
 
     public MeriekeRiBeritCreateDelayedTriggerEffect() {
         super(Outcome.Detriment);
-        this.staticText = "When {this} leaves the battlefield or becomes untapped, destroy that creature.  It can't be regenerated.";
+        this.staticText = "When {this} leaves the battlefield or becomes untapped, destroy that creature. It can't be regenerated";
     }
 
     public MeriekeRiBeritCreateDelayedTriggerEffect(final MeriekeRiBeritCreateDelayedTriggerEffect effect) {
@@ -114,12 +114,8 @@ class MeriekeRiBeritCreateDelayedTriggerEffect extends OneShotEffect {
         Permanent controlledCreature = game.getPermanent(source.getFirstTarget());
         if (controlledCreature != null) {
             DelayedTriggeredAbility delayedAbility = new MeriekeRiBeritDelayedTriggeredAbility();
-            delayedAbility.getEffects().get(0).setTargetPointer(new FixedTarget(controlledCreature.getId()));
-            delayedAbility.setSourceId(source.getSourceId());
-            delayedAbility.setControllerId(source.getControllerId());
-            delayedAbility.setSourceObject(source.getSourceObject(game), game);
-            delayedAbility.init(game);
-            game.addDelayedTriggeredAbility(delayedAbility);
+            delayedAbility.getEffects().get(0).setTargetPointer(new FixedTarget(controlledCreature, game));
+            game.addDelayedTriggeredAbility(delayedAbility, source);
             return true;
         }
         return false;
@@ -129,7 +125,7 @@ class MeriekeRiBeritCreateDelayedTriggerEffect extends OneShotEffect {
 class MeriekeRiBeritDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     MeriekeRiBeritDelayedTriggeredAbility() {
-        super(new DestroyTargetEffect(true), Duration.EndOfGame, true);
+        super(new DestroyTargetEffect(true), Duration.Custom, true);
     }
 
     MeriekeRiBeritDelayedTriggeredAbility(MeriekeRiBeritDelayedTriggeredAbility ability) {
@@ -142,9 +138,15 @@ class MeriekeRiBeritDelayedTriggeredAbility extends DelayedTriggeredAbility {
                 || event.getType() == EventType.UNTAPPED;
     }
 
+    @Override
+    public boolean isInactive(Game game) {
+        return getSourceObjectIfItStillExists(game) == null
+                && game.getLastKnownInformation(getSourceId(), Zone.BATTLEFIELD, getSourceObjectZoneChangeCounter()) == null;
+    }
+
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getSourceId() != null) {
+        if (event.getTargetId() != null) {
             if (GameEvent.EventType.ZONE_CHANGE.equals(event.getType())
                     && event.getTargetId().equals(getSourceId())) {
                 ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/MeriekeRiBeritTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/MeriekeRiBeritTest.java
new file mode 100644
index 00000000000..891670d4d96
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/delayed/MeriekeRiBeritTest.java
@@ -0,0 +1,69 @@
+/*
+ *  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.delayed;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class MeriekeRiBeritTest extends CardTestPlayerBase {
+
+    /**
+     * Opponent-controlled Merieke Ri Berit, and it had stolen a creature of
+     * mine. When I killed Merieke, I got my creature back instead of it being
+     * destroyed.
+     */
+    @Test
+    public void testCreatureWasDestroyed() {
+        addCard(Zone.HAND, playerA, "Lightning Bolt", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
+
+        // Merieke Ri Berit doesn't untap during your untap step.
+        // {T}: Gain control of target creature for as long as you control Merieke Ri Berit. When Merieke Ri Berit leaves the battlefield or becomes untapped, destroy that creature. It can't be regenerated.
+        addCard(Zone.BATTLEFIELD, playerB, "Merieke Ri Berit", 1); // Creature 1/1
+
+        activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Gain control", "Silvercoat Lion");
+
+        castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Merieke Ri Berit");
+
+        setStopAt(2, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerA, "Lightning Bolt", 1);
+        assertGraveyardCount(playerB, "Merieke Ri Berit", 1);
+        assertPermanentCount(playerA, "Silvercoat Lion", 0);
+        assertGraveyardCount(playerA, "Silvercoat Lion", 1);
+    }
+
+}