diff --git a/.gitattributes b/.gitattributes
index 1956fefffde..c4fbd85c415 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8084,6 +8084,7 @@ res/cardsfolder/s/shanodin_dryads.txt svneol=native#text/plain
 res/cardsfolder/s/shape_anew.txt -text
 res/cardsfolder/s/shape_stealer.txt -text svneol=unset#text/plain
 res/cardsfolder/s/shaper_guildmage.txt svneol=native#text/plain
+res/cardsfolder/s/shaper_parasite.txt -text
 res/cardsfolder/s/shapeshifter.txt svneol=native#text/plain
 res/cardsfolder/s/shard_convergence.txt svneol=native#text/plain
 res/cardsfolder/s/shard_phoenix.txt svneol=native#text/plain
diff --git a/res/cardsfolder/s/shaper_parasite.txt b/res/cardsfolder/s/shaper_parasite.txt
new file mode 100644
index 00000000000..600057fc052
--- /dev/null
+++ b/res/cardsfolder/s/shaper_parasite.txt
@@ -0,0 +1,15 @@
+Name:Shaper Parasite
+ManaCost:1 U U
+Types:Creature Illusion
+Text:no text
+PT:2/3
+K:Morph:2 U
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigChoice | TriggerDescription$ When CARDNAME is turned face up, target creature gets +2/-2 or -2/+2 until end of turn.
+SVar:TrigChoice:AB$ GenericChoice | ValidTgts$ Creature | TgtPrompt$ Select target creature | Cost$ 0 | Defined$ You | Choices$ TrigPump1,TrigPump2
+SVar:TrigPump1:DB$Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +2 | NumDef$ -2 | IsCurse$ True | ChoiceDescription$ +2/-2
+SVar:TrigPump2:DB$Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ -2 | NumDef$ +2 | IsCurse$ True | ChoiceDescription$ -2/+2
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shaper_parasite.jpg
+SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/46.jpg
+Oracle:Morph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Shaper Parasite is turned face up, target creature gets +2/-2 or -2/+2 until end of turn.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java
index 1c5aa3234e7..2403fc268bc 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChoose.java
@@ -1996,7 +1996,7 @@ public final class AbilityFactoryChoose {
         ArrayList<Player> tgtPlayers;
 
         final Target tgt = sa.getTarget();
-        if (tgt != null) {
+        if (!params.containsKey("Defined")) {
             tgtPlayers = tgt.getTargetPlayers();
         } else {
             tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), params.get("Defined"), sa);