diff --git a/src/main/java/forge/card/ability/ApiType.java b/src/main/java/forge/card/ability/ApiType.java
index 946938322d3..0459b15f268 100644
--- a/src/main/java/forge/card/ability/ApiType.java
+++ b/src/main/java/forge/card/ability/ApiType.java
@@ -155,7 +155,7 @@ public enum ApiType {
     GenericChoice (ChooseGenericEffect.class, CannotPlayAi.class),
     LoseLife (LifeLoseEffect.class, LifeLoseAi.class),
     LosesGame (GameLossEffect.class, GameLossAi.class),
-    Mana (ManaEffect.class, CannotPlayAi.class),
+    Mana (ManaEffect.class, CanPlayAsDrawbackAi.class),
     ManaReflected (ManaReflectedEffect.class, CannotPlayAi.class),
     Mill (MillEffect.class, MillAi.class),
     MoveCounter (CountersMoveEffect.class, CountersMoveAi.class),
diff --git a/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java b/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java
index 0441c16a1aa..378cd607972 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java
@@ -71,13 +71,19 @@ public class StaticAbilityPreventDamage {
             return restDamage;
         }
 
-        if (!isTest && params.containsKey("Optional")) { //Assume if param is present it should be optional
-            final String logic = params.containsKey("AILogic") ? params.get("AILogic") : "";
-            final String message = "Apply the effect of " + hostCard + "? (Affected: " + target + ")";
-            boolean confirmed = hostCard.getController().getController().confirmStaticApplication(hostCard, target, logic, message);
-
-            if (!confirmed) {
-                return restDamage;
+        if (params.containsKey("Optional")) { //Assume if param is present it should be optional
+            if (!isTest) {
+                final String logic = params.containsKey("AILogic") ? params.get("AILogic") : "";
+                final String message = "Apply the effect of " + hostCard + "? (Affected: " + target + ")";
+                boolean confirmed = hostCard.getController().getController().confirmStaticApplication(hostCard, target, logic, message);
+    
+                if (!confirmed) {
+                    return restDamage;
+                }
+            } else { //test
+                if (!hostCard.getController().equals(target)) {
+                    return restDamage;
+                }
             }
         }