diff --git a/Mage/src/main/java/mage/abilities/common/AttackingCreaturePutIntoGraveyardTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttackingCreaturePutIntoGraveyardTriggeredAbility.java
index afb204e564..e0f7e1b84d 100644
--- a/Mage/src/main/java/mage/abilities/common/AttackingCreaturePutIntoGraveyardTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/AttackingCreaturePutIntoGraveyardTriggeredAbility.java
@@ -94,9 +94,6 @@ public class AttackingCreaturePutIntoGraveyardTriggeredAbility extends Triggered
                 }
             case REMOVED_FROM_COMBAT:
                 // a card removed from combat is no longer an attacker or blocker so remove it from the list
-                if (game.isSimulation()) {  // a simulated game will always choose to apply any triggered effect IE: Gustcloak Savior
-                    return false;
-                }
                 List<UUID> attackersList = (List<UUID>) game.getState().getValue(this.getSourceId() + "Attackers");
                 if (attackersList != null
                         && attackersList.contains(event.getTargetId())) {
diff --git a/Mage/src/main/java/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java
index 8707845859..491c26b587 100644
--- a/Mage/src/main/java/mage/game/GameState.java
+++ b/Mage/src/main/java/mage/game/GameState.java
@@ -172,6 +172,8 @@ public class GameState implements Serializable, Copyable<GameState> {
                 this.values.put(entry.getKey(), ((EnumSet) entry.getValue()).clone());
             } else if (entry.getValue() instanceof HashMap) {
                 this.values.put(entry.getKey(), ((HashMap) entry.getValue()).clone());
+            } else if (entry.getValue() instanceof List) {
+                this.values.put(entry.getKey(), ((List) entry.getValue()).stream().collect(Collectors.toList()));
             } else {
                 this.values.put(entry.getKey(), entry.getValue());
             }