diff --git a/Mage.Sets/src/mage/cards/m/MightyServantOfLeukO.java b/Mage.Sets/src/mage/cards/m/MightyServantOfLeukO.java
index c94e0723a9..c15ac4fe95 100644
--- a/Mage.Sets/src/mage/cards/m/MightyServantOfLeukO.java
+++ b/Mage.Sets/src/mage/cards/m/MightyServantOfLeukO.java
@@ -140,7 +140,7 @@ class MightyServantOfLeukOWatcher extends Watcher {
         MightyServantOfLeukOWatcher watcher = game
                 .getState()
                 .getWatcher(MightyServantOfLeukOWatcher.class);
-        MageObjectReference mor = new MageObjectReference(source);
+        MageObjectReference mor = new MageObjectReference(game.getPermanent(source.getSourceId()), game);
         return watcher
                 .crewCount
                 .getOrDefault(mor, 0) < 2
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ConvokedSourceCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ConvokedSourceCount.java
index f540d0f935..e2be96efed 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ConvokedSourceCount.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ConvokedSourceCount.java
@@ -21,7 +21,7 @@ public enum ConvokedSourceCount implements DynamicValue {
 
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
-        return ConvokeWatcher.getConvokingCreatures(new MageObjectReference(sourceAbility, offset), game).size();
+        return ConvokeWatcher.getConvokingCreatures(new MageObjectReference(game.getObject(sourceAbility), game, offset), game).size();
     }
 
     @Override