From 73395aabd4c96adedaa4428dcd567f93fcd6052a Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 22 Jul 2020 00:04:29 +0200
Subject: [PATCH] * Fecundity - Fixed that not always LKI was retrieved to
 check if a creature died (fixes #6867).

---
 Mage.Sets/src/mage/cards/f/Fecundity.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/f/Fecundity.java b/Mage.Sets/src/mage/cards/f/Fecundity.java
index d25ca1a6db1..e59f570461e 100644
--- a/Mage.Sets/src/mage/cards/f/Fecundity.java
+++ b/Mage.Sets/src/mage/cards/f/Fecundity.java
@@ -1,4 +1,3 @@
-
 package mage.cards.f;
 
 import java.util.UUID;
@@ -21,7 +20,7 @@ import mage.players.Player;
 public final class Fecundity extends CardImpl {
 
     public Fecundity(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
 
         // Whenever a creature dies, that creature's controller may draw a card.
         this.addAbility(new DiesCreatureTriggeredAbility(new FecundityEffect(), false, false, true));
@@ -55,7 +54,9 @@ class FecundityEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = (Permanent) game.getLastKnownInformation(this.getTargetPointer().getFirst(game, source), Zone.BATTLEFIELD);
+        Permanent permanent = (Permanent) game.getLastKnownInformation(this.getTargetPointer()
+                // Card can be moved again (e.g. commander replacement) so we need the row id from fixed target to check
+                .getFixedTarget(game, source).getTarget(), Zone.BATTLEFIELD);
         if (permanent != null) {
             Player controller = game.getPlayer(permanent.getControllerId());
             if (controller != null) {