diff --git a/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java b/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
index 61325514eda..cbbf3d80927 100644
--- a/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
+++ b/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
@@ -143,12 +143,12 @@ class IndomitableCreativityEffect extends OneShotEffect {
                             cards.add(card);
                         }
 
-                        if (card.isCreature() || card.isArtifact()) {
-                            controllerOfDestroyedCreature.moveCards(card, Zone.BATTLEFIELD, source, game);
-                        }
-
                         if (!cards.isEmpty()) {
                             revealCards.addAll(cards);
+                            if (card.isCreature() || card.isArtifact()) {
+                                controllerOfDestroyedCreature.moveCards(card, Zone.EXILED, source, game);
+                                controllerOfDestroyedCreature.moveCards(card, Zone.BATTLEFIELD, source, game);
+                            }
                             Set<Card> cardsToShuffle = cards.getCards(game);
                             cardsToShuffle.remove(card);
                             library.addAll(cardsToShuffle, game);
diff --git a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java
index dc403740861..8a09809ebee 100644
--- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java
+++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java
@@ -56,7 +56,7 @@ public class TargetCreaturePermanentSameController extends TargetCreaturePermane
                     UUID targetId = (UUID) object;
                     Permanent targetPermanent = game.getPermanent(targetId);
                     if (targetPermanent != null) {
-                        if (firstTargetPermanent.getId() != targetPermanent.getId()) {
+                        if (!firstTargetPermanent.getId().equals(targetPermanent.getId())) {
                             if (!firstTargetPermanent.getControllerId().equals(targetPermanent.getOwnerId())) {
                                 return false;
                             }
diff --git a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
index a480187b9c2..9d2b1fd48a7 100644
--- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
+++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
@@ -61,7 +61,7 @@ public class TargetCreaturePermanentWithDifferentTypes extends TargetCreaturePer
                 for (Object object : getTargets()) {
                     UUID targetId = (UUID) object;
                     Permanent selectedCreature = game.getPermanent(targetId);
-                    if (creature.getId() != selectedCreature.getId()) {
+                    if (!creature.getId().equals(selectedCreature.getId())) {
                         if (CardUtil.shareSubtypes(creature, selectedCreature, game)) {
                             return false;
                         }