diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java
index bcc850365e6..5465df9aff3 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java
@@ -106,7 +106,7 @@ class ChemistersTrickEffect extends OneShotEffect<ChemistersTrickEffect> {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        for (Permanent creature : game.getBattlefield().getAllActivePermanents(filter, game)) {
+        for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
             AttacksIfAbleTargetEffect effect = new AttacksIfAbleTargetEffect(Duration.EndOfTurn);
             effect.setTargetPointer(new FixedTarget(creature.getId()));
             game.addEffect(effect, source);
diff --git a/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java b/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java
index 4d7f91e231e..6af6b06d8d2 100644
--- a/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/AttacksIfAbleTargetEffect.java
@@ -56,8 +56,7 @@ public class AttacksIfAbleTargetEffect extends RequirementEffect<AttacksIfAbleTa
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        Permanent creature = game.getPermanent(source.getFirstTarget());
-        if (creature != null && creature.getId().equals(permanent.getId())) {
+        if (this.getTargetPointer().getTargets(game, source).contains(permanent.getId())) {
             return true;
         }
         return false;
@@ -75,10 +74,12 @@ public class AttacksIfAbleTargetEffect extends RequirementEffect<AttacksIfAbleTa
 
     @Override
     public String getText(Mode mode) {
-        if (this.duration == Duration.EndOfTurn)
-            return "Target " + mode.getTargets().get(0).getTargetName() + " attacks this turn if able";
-        else
-            return "Target " + mode.getTargets().get(0).getTargetName() + " attacks each turn if able";
+        if (this.duration == Duration.EndOfTurn) {
+            return new StringBuilder("Target ").append(mode.getTargets().get(0).getTargetName()).append(" attacks this turn if able").toString();
+        }
+        else {
+            return new StringBuilder("Target ").append(mode.getTargets().get(0).getTargetName()).append(" attacks each turn if able").toString();
+        }
     }
 
 }
\ No newline at end of file