diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index 3f6e79d0711..844559a5f7d 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -57,6 +57,7 @@ import mage.game.permanent.Permanent;
 import mage.target.Target;
 import mage.target.TargetAmount;
 import mage.target.TargetCard;
+import mage.target.TargetPermanent;
 import mage.target.common.TargetAttackingCreature;
 import mage.target.common.TargetCreatureOrPlayer;
 import mage.target.common.TargetCreaturePermanent;
@@ -185,7 +186,13 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
 			game.fireSelectTargetEvent(playerId, target.getMessage(), target.possibleTargets(null, playerId, game), target.isRequired());
 			waitForResponse();
 			if (response.getUUID() != null) {
-				if (target.canTarget(response.getUUID(), game)) {
+				if (target instanceof TargetPermanent) {
+					if (((TargetPermanent)target).canTarget(playerId, response.getUUID(), null, game)) {
+						target.add(response.getUUID(), game);
+						return true;
+					}
+				}
+				else if (target.canTarget(response.getUUID(), game)) {
 					target.add(response.getUUID(), game);
 					return true;
 				}
diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar
index fd19e97cd05..e87be8943c2 100644
Binary files a/Mage.Server/plugins/mage-player-human.jar and b/Mage.Server/plugins/mage-player-human.jar differ
diff --git a/Mage/src/mage/MageObject.java b/Mage/src/mage/MageObject.java
index 0c41f4629f9..63035c2f67f 100644
--- a/Mage/src/mage/MageObject.java
+++ b/Mage/src/mage/MageObject.java
@@ -27,9 +27,6 @@ public interface MageObject extends MageItem, Serializable {
 	public MageInt getToughness();
 	public MageInt getLoyalty();
 
-//	public Zone getZone();
-//	public void setZone(Zone zone);
-
 	public void adjustCosts(Ability ability, Game game);
 
 	public MageObject copy();
diff --git a/Mage/src/mage/MageObjectImpl.java b/Mage/src/mage/MageObjectImpl.java
index 49ac4b7edc3..7c7b8abc1e1 100644
--- a/Mage/src/mage/MageObjectImpl.java
+++ b/Mage/src/mage/MageObjectImpl.java
@@ -32,7 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import mage.Constants.CardType;
-import mage.Constants.Zone;
 
 import mage.abilities.Abilities;
 import mage.abilities.AbilitiesImpl;
@@ -57,7 +56,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
 	protected MageInt power;
 	protected MageInt toughness;
 	protected MageInt loyalty;
-//	protected Zone zone;
 	
 	@Override
 	public abstract T copy();
@@ -81,7 +79,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
 		name = object.name;
 		manaCost = object.manaCost.copy();
 		text = object.text;
-//		zone = object.zone;
 		color = object.color.copy();
 		power = object.power.copy();
 		toughness = object.toughness.copy();
@@ -158,16 +155,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
 		return manaCost;
 	}
 
-//	@Override
-//	public Zone getZone() {
-//		return zone;
-//	}
-//
-//	@Override
-//	public void setZone(Zone zone) {
-//		this.zone = zone;
-//	}
-
 	@Override
 	public void adjustCosts(Ability ability, Game game) {}
 
diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java
index ef80f89bfde..ea3e7179bcf 100644
--- a/Mage/src/mage/filter/FilterObject.java
+++ b/Mage/src/mage/filter/FilterObject.java
@@ -32,7 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import mage.Constants.CardType;
-import mage.Constants.Zone;
 import mage.MageObject;
 import mage.ObjectColor;
 import mage.abilities.Abilities;