diff --git a/Mage/src/main/java/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java
index c800d552b5..a7772147a7 100644
--- a/Mage/src/main/java/mage/target/TargetImpl.java
+++ b/Mage/src/main/java/mage/target/TargetImpl.java
@@ -117,7 +117,11 @@ public abstract class TargetImpl implements Target {
                 || targetName.startsWith("an ")
                 || targetName.startsWith("any ")) {
             return "Select " + targetName + suffix;
-        } else if (targetName.startsWith("a") || targetName.startsWith("e") || targetName.startsWith("i") || targetName.startsWith("o") || targetName.startsWith("u")) {
+        }
+        if (getMinNumberOfTargets() == 0 && getMaxNumberOfTargets() == 1) {
+            return "Select up to one " + targetName + suffix;
+        }
+        if (targetName.startsWith("a") || targetName.startsWith("e") || targetName.startsWith("i") || targetName.startsWith("o") || targetName.startsWith("u")) {
             return "Select an " + targetName + suffix;
         }
         return "Select a " + targetName + suffix;