From b10b973d096c4535bd950cf852042fd771e35aa6 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@delmarus.com>
Date: Thu, 28 Mar 2019 17:34:51 -0500
Subject: [PATCH] - Fixed #5661

---
 Mage.Sets/src/mage/cards/m/MesmericFiend.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/m/MesmericFiend.java b/Mage.Sets/src/mage/cards/m/MesmericFiend.java
index 87e8299c2bd..73631029031 100644
--- a/Mage.Sets/src/mage/cards/m/MesmericFiend.java
+++ b/Mage.Sets/src/mage/cards/m/MesmericFiend.java
@@ -86,15 +86,14 @@ class MesmericFiendExileEffect extends OneShotEffect {
                 Card card = opponent.getHand().get(target.getFirstTarget(), game);
                 if (card != null) {
                     UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
+                    game.getState().setValue(source.getSourceId().toString() + source.getSourceObjectZoneChangeCounter(), exileId);
                     controller.moveCardsToExile(card, source, game, true, exileId, sourcePermanent.getName());
                 }
             }
-
             return true;
         }
         return false;
     }
-
 }
 
 class MesmericFiendLeaveEffect extends OneShotEffect {
@@ -119,7 +118,8 @@ class MesmericFiendLeaveEffect extends OneShotEffect {
         MageObject sourceObject = source.getSourceObject(game);
         if (controller != null
                 && sourceObject != null) {
-            UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter() - 1);
+            int zoneChangeMinusOne = source.getSourceObjectZoneChangeCounter() - 1;
+            UUID exileId = (UUID) game.getState().getValue(source.getSourceId().toString() + zoneChangeMinusOne);
             if (exileId != null) {
                 Cards cards = game.getExile().getExileZone(exileId);
                 if (!cards.isEmpty()) {