diff --git a/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java b/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java
index 7e2ab26e168..abcb06b0024 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java
@@ -53,13 +53,11 @@ public class LordOfExtinction extends CardImpl {
         this.expansionSetCode = "ARB";
         this.subtype.add("Elemental");
 
-
-        
         this.power = new MageInt(0);
         this.toughness = new MageInt(0);
 
         // Lord of Extinction's power and toughness are each equal to the number of cards in all graveyards.
-        this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new LordOfExtinctionDynamicCount(), Duration.WhileOnBattlefield)));
+        this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new LordOfExtinctionDynamicCount(), Duration.EndOfGame)));
     }
 
     public LordOfExtinction(final LordOfExtinction card) {
diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
index 1166c5a2dac..8827ac622b1 100644
--- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
+++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
@@ -662,9 +662,13 @@ public class TestPlayer implements Player {
 
                         }
                     }
-                    if (targetFound && targetCard.isChosen()) {
-                        choices.remove(choose2);
-                        return true;
+                    if (targetFound) {
+                        if (targetCard.isChosen()) {
+                            choices.remove(choose2);
+                            return true;
+                        } else {
+                            target.clearChosen();
+                        }
                     }
                 }
             }