diff --git a/forge-game/src/main/java/forge/game/combat/CombatView.java b/forge-game/src/main/java/forge/game/combat/CombatView.java
index 817de9b19eb..45290ce4aaf 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatView.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatView.java
@@ -53,7 +53,7 @@ public class CombatView extends TrackableObject {
     }
 
     public Iterable<CardView> getAttackers() {
-        return getAttackersWithDefenders().keySet();
+        return new HashSet<CardView>(getAttackersWithDefenders().keySet());
     }
 
     public Iterable<GameEntityView> getDefenders() {
diff --git a/forge-game/src/main/java/forge/game/spellability/StackItemView.java b/forge-game/src/main/java/forge/game/spellability/StackItemView.java
index db0a79fb3c6..b37b2cb4fd9 100644
--- a/forge-game/src/main/java/forge/game/spellability/StackItemView.java
+++ b/forge-game/src/main/java/forge/game/spellability/StackItemView.java
@@ -5,6 +5,7 @@ import forge.game.player.PlayerView;
 import forge.trackable.TrackableCollection;
 import forge.trackable.TrackableObject;
 import forge.trackable.TrackableProperty;
+import forge.util.FCollectionView;
 
 
 public class StackItemView extends TrackableObject {
@@ -72,14 +73,14 @@ public class StackItemView extends TrackableObject {
         set(TrackableProperty.ActivatingPlayer, PlayerView.get(si.getActivatingPlayer()));
     }
 
-    public Iterable<CardView> getTargetCards() {
+    public FCollectionView<CardView> getTargetCards() {
         return get(TrackableProperty.TargetCards);
     }
     void updateTargetCards(SpellAbilityStackInstance si) {
         set(TrackableProperty.TargetCards, CardView.getCollection(si.getTargetChoices().getTargetCards()));
     }
 
-    public Iterable<PlayerView> getTargetPlayers() {
+    public FCollectionView<PlayerView> getTargetPlayers() {
         return get(TrackableProperty.TargetPlayers);
     }
     void updateTargetPlayers(SpellAbilityStackInstance si) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
index 224fa1481fa..7558f558cd3 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
@@ -265,8 +265,7 @@ public enum TargetingOverlay {
                 addArc(endpoints.get(defender.getId()), endpoints.get(c.getId()), true);
             }
             // if c is a planeswalker that's being attacked
-            final Iterable<CardView> attackers = combat.getAttackersOf(c);
-            for (final CardView pwAttacker : attackers) {
+            for (final CardView pwAttacker : combat.getAttackersOf(c)) {
                 addArc(endpoints.get(c.getId()), endpoints.get(pwAttacker.getId()), true);
             }
             for (final CardView attackingCard : combat.getAttackers()) {