diff --git a/res/cardsfolder/a/avatar_of_discord.txt b/res/cardsfolder/a/avatar_of_discord.txt
index 16b85c53b01..9a307a899e6 100644
--- a/res/cardsfolder/a/avatar_of_discord.txt
+++ b/res/cardsfolder/a/avatar_of_discord.txt
@@ -3,11 +3,8 @@ ManaCost:BR BR BR
 Types:Creature Avatar
 PT:5/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you discard two cards.
-SVar:TrigDiscard:AB$ Discard | Cost$ 0 | NumCards$ 2 | DiscardValid$ Card | Mode$ TgtChoose | Optional$ True | RememberDiscarded$ True | SubAbility$ DBSacSelf
-SVar:DBSacSelf:DB$ Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBCleanup | ConditionCheckSVar$ X | ConditionSVarCompare$ LT2 | References$ X
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacSelf | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you discard two cards.
+SVar:DBSacSelf:DB$ Sacrifice | Cost$ 0 | Defined$ Self | UnlessCost$ Discard<2/Card> | UnlessPayer$ You
 SVar:NeedsToPlayVar:Y GE3
 SVar:Y:Count$InYourHand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avatar_of_discord.jpg
diff --git a/src/main/java/forge/game/ai/ComputerUtilCost.java b/src/main/java/forge/game/ai/ComputerUtilCost.java
index e218dc57aae..dd27da73197 100644
--- a/src/main/java/forge/game/ai/ComputerUtilCost.java
+++ b/src/main/java/forge/game/ai/ComputerUtilCost.java
@@ -417,7 +417,7 @@ public class ComputerUtilCost {
         if (canPayCost(ability, payer)
                 && checkLifeCost(payer, ability.getPayCosts(), source, 4, sa)
                 && checkDamageCost(payer, ability.getPayCosts(), source, 4)
-                && checkDiscardCost(payer, ability.getPayCosts(), source)
+                && (isMine || checkDiscardCost(payer, ability.getPayCosts(), source))
                 && (!source.getName().equals("Tyrannize") || payer.getCardsIn(ZoneType.Hand).size() > 2)
                 && (!source.getName().equals("Perplex") || payer.getCardsIn(ZoneType.Hand).size() < 2)
                 && (!source.getName().equals("Breaking Point") || payer.getCreaturesInPlay().size() > 1)