diff --git a/res/cardsfolder/c/cosmic_horror.txt b/res/cardsfolder/c/cosmic_horror.txt
index 3f7e4decfad..3ec2eedd4d7 100644
--- a/res/cardsfolder/c/cosmic_horror.txt
+++ b/res/cardsfolder/c/cosmic_horror.txt
@@ -1,9 +1,11 @@
 Name:Cosmic Horror
 ManaCost:3 B B B
 Types:Creature Horror
-Text:If Cosmic Horror is destroyed this way, it deals 7 damage to you.
 PT:7/7
 K:First Strike
-K:At the beginning of your upkeep, destroy CARDNAME unless you pay 3 B B B
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ At the beginning of your upkeep, destroy CARDNAME unless you pay 3 B B B. If CARDNAME is destroyed this way, it deals 7 damage to you.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ Self | RememberDestroyed$ True | UnlessCost$ 3 B B B | UnlessPayer$ You | SubAbility$ DBDmg
+SVar:DBDmg:DB$ DealDamage | Defined$ You | NumDmg$ 7 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cosmic_horror.jpg
 Oracle:First strike\nAt the beginning of your upkeep, destroy Cosmic Horror unless you pay {3}{B}{B}{B}. If Cosmic Horror is destroyed this way, it deals 7 damage to you.
\ No newline at end of file
diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java
index f182091a5ee..453beb89da4 100644
--- a/src/main/java/forge/game/phase/Upkeep.java
+++ b/src/main/java/forge/game/phase/Upkeep.java
@@ -224,9 +224,6 @@ public class Upkeep extends Phase {
                                 }
                             }
                             if( !isUpkeepPaid ) {
-                                if (c.getName().equals("Cosmic Horror")) {
-                                    controller.addDamage(7, c);
-                                }
                                 game.getAction().destroy(c, this);
                             }