diff --git a/Mage.Common/src/main/java/mage/view/StackAbilityView.java b/Mage.Common/src/main/java/mage/view/StackAbilityView.java
index 5c935cf674d..cdbd596d3da 100644
--- a/Mage.Common/src/main/java/mage/view/StackAbilityView.java
+++ b/Mage.Common/src/main/java/mage/view/StackAbilityView.java
@@ -32,7 +32,7 @@ public class StackAbilityView extends CardView {
 
     public StackAbilityView(Game game, StackAbility ability, String sourceName, MageObject sourceObject, CardView sourceView) {
         this.id = ability.getId();
-        this.mageObjectType = MageObjectType.ABILITY_STACK;
+        this.mageObjectType = sourceView.getMageObjectType().isUseTokensRepository() ? MageObjectType.ABILITY_STACK_FROM_TOKEN : MageObjectType.ABILITY_STACK_FROM_CARD;
         this.abilityType = ability.getStackAbility().getAbilityType();
         this.sourceCard = sourceView;
         this.sourceCard.setMageObjectType(mageObjectType);
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index 49470e3d21b..b9c5d2c9e1a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -1126,17 +1126,10 @@ public class TestPlayer implements Player {
 
     private Permanent findPermanentWithAssert(PlayerAction action, Game game, Player player, String cardName) {
         for (Permanent perm : game.getBattlefield().getAllActivePermanents(player.getId())) {
-            // need by controller
-            if (!perm.getControllerId().equals(player.getId())) {
-                continue;
-            }
-
             // need by alias or by name
             if (!hasObjectTargetNameOrAlias(perm, cardName)) {
                 continue;
             }
-
-            // all fine
             return perm;
         }
         printStart(game, "Permanents of " + player.getName());
diff --git a/Mage/src/main/java/mage/constants/MageObjectType.java b/Mage/src/main/java/mage/constants/MageObjectType.java
index f0ff79b9671..b870492232b 100644
--- a/Mage/src/main/java/mage/constants/MageObjectType.java
+++ b/Mage/src/main/java/mage/constants/MageObjectType.java
@@ -43,7 +43,8 @@ package mage.constants;
  * @author LevelX2
  */
 public enum MageObjectType {
-    ABILITY_STACK("Ability on the Stack", false, false, false),
+    ABILITY_STACK_FROM_CARD("Ability on the Stack", false, false, false),
+    ABILITY_STACK_FROM_TOKEN("Ability on the Stack", false, false, true),
     CARD("Card", false, true, false),
     COPY_CARD("Copy of a Card", false, true, false),
     TOKEN("Token", true, true, true),