diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 80fab949f27..68e868e5aef 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -640,10 +640,6 @@ public class GameAction {
             return this.moveTo(removed, c);
         }
 
-        if (p != null) {
-            p.remove(c);
-        }
-
         if (c.isToken()) {
             return c;
         }
@@ -666,6 +662,14 @@ public class GameAction {
             library.add(c, libPosition);
         }
 
+        if (p != null) {
+            if (p.is(ZoneType.Battlefield) && c.isCreature() && game.getCombat() != null) {
+                game.getCombat().saveLKI(lastKnownInfo);
+                game.getCombat().removeFromCombat(c); 
+            }
+            p.remove(c);
+        }
+
         final HashMap<String, Object> runParams = new HashMap<String, Object>();
         runParams.put("Card", lastKnownInfo);
         if (p != null) {