diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 49a0d5dfaa6..b1a45bc1788 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3328,9 +3328,8 @@ public class CardFactoryUtil {
             if (n != -1) {
                 // Set Madness Replacement effects
                 String repeffstr = "Event$ Discard | ActiveZones$ Hand | ValidCard$ Card.Self | " +
-                		"ReplaceWith$ DiscardMadness | Secondary$ True | Description$ If you would" +
-                		" discard this card, you discard it, but may exile it instead of putting it" +
-                		" into your graveyard";
+                		"ReplaceWith$ DiscardMadness | Secondary$ True | Description$ If you" +
+                		" discard this card, discard it into exile.";
                 ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, card, true);
                 card.addReplacementEffect(re);
                 String sVarMadness = "DB$ Discard | Defined$ ReplacedPlayer" +
diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
index 3eca94aebaa..d476799c9eb 100644
--- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
@@ -183,7 +183,7 @@ public class SFilterUtil {
                         if (useColorIdentity && !allColorsFilteredOut) {
                             result = color.hasAnyColor(colors) || (wantColorless && color.isColorless());
                         } else {
-                            result = rules.canCastWithAvailable(colors);
+                            result = (wantColorless && color.isColorless()) || rules.canCastWithAvailable(colors);
                         }
                     }
                 } else {