diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/RoilingWaters.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/RoilingWaters.java
index 7b78a21f1f7..4b2923d236f 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/RoilingWaters.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/RoilingWaters.java
@@ -47,10 +47,10 @@ import mage.target.targetpointer.SecondTargetPointer;
  */
 public class RoilingWaters extends CardImpl {
 
-    private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
+    private final static FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creatures your opponents control");
 
     static {
-        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+        FILTER.add(new ControllerPredicate(TargetController.OPPONENT));
     }
 
     public RoilingWaters(UUID ownerId) {
@@ -59,7 +59,7 @@ public class RoilingWaters extends CardImpl {
 
         // Return up to two target creatures your opponents control to their owners' hands.
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, filter, false));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, FILTER, false));
         // Target player draws two cards.
         Effect effect = new DrawCardTargetEffect(2);
         effect.setTargetPointer(new SecondTargetPointer());
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
index 2fdadd898df..76558defd9c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DrawCardTargetEffect.java
@@ -36,6 +36,8 @@ import mage.abilities.effects.OneShotEffect;
 import mage.constants.Outcome;
 import mage.game.Game;
 import mage.players.Player;
+import mage.target.Target;
+import mage.target.targetpointer.SecondTargetPointer;
 import mage.util.CardUtil;
 
 /**
@@ -107,7 +109,13 @@ public class DrawCardTargetEffect extends OneShotEffect {
         }
         StringBuilder sb = new StringBuilder();
         if (mode.getTargets().size() > 0) {
-            sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
+            Target target;
+            if (targetPointer instanceof SecondTargetPointer && mode.getTargets().size() > 1) {
+                target = mode.getTargets().get(1);
+            } else {
+                target = mode.getTargets().get(0);
+            }
+            sb.append("Target ").append(target.getTargetName());
         } else {
             sb.append("that player");
         }