diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java
index 533599c13e0..a670415d560 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java
@@ -132,7 +132,7 @@ class DimirCharmEffect extends OneShotEffect {
             }
             
             if(cards.size() > 0){
-                TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("Card to put on top"));
+                TargetCard target = new TargetCard(Constants.Zone.PICK, new FilterCard("Card to put back on top of library"));
                 target.setRequired(true);
                 if(controller.choose(Outcome.Neutral, cards, target, game)){
                     Card card = cards.get(target.getFirstTarget(), game);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java
index 939836a7365..29c5c18d8be 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java
@@ -102,15 +102,14 @@ class CreatureCardPutOpponentGraveyardTriggeredAbility extends TriggeredAbilityI
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getType() == EventType.ZONE_CHANGE
                 && ((ZoneChangeEvent) event).getToZone() == Zone.GRAVEYARD) {
-            MageObject object = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
-            if (object == null) {
+            Card card = game.getCard(event.getTargetId());
+            if (card == null) {
                 return false;
             }
             if (game.getOpponents(controllerId).contains(event.getPlayerId())
-                    && object.getCardType().contains(CardType.CREATURE)
-                    && (!(object instanceof PermanentToken))) {
+                    && card.getCardType().contains(CardType.CREATURE)) {
                 for (Effect effect : this.getEffects()) {
-                    effect.setTargetPointer(new FixedTarget(object.getId()));
+                    effect.setTargetPointer(new FixedTarget(card.getId()));
                 }
                 return true;
             }