diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Elven.hjson
index 5596b1623..6fe49b09f 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Elven.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Elven.hjson
@@ -1036,10 +1036,12 @@
 			trigger: {
 				type: winsSkirmish
 				filter: elf
+				memorize: winner
 			}
 			cost: {
 				type: exert
-				select: choose(skirmishWinner)
+				select: memory(winner)
+				ignoreCostCheckFailure: true
 			},
 			effect: [
 				{
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gandalf.hjson
index 6cc978143..1c33b7d85 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gandalf.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Gandalf.hjson
@@ -182,10 +182,12 @@
 				trigger: {
 					type: winsSkirmish
 					filter: name(Gandalf)
+					memorize: winner
 				}
 				cost: {
 					type: exert
-					select: choose(skirmishWinner)
+					select: memory(winner)
+					ignoreCostCheckFailure: true
 				}
 				effect: {
 					type: drawCards
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java
index e824bf34c..75466f62a 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java
@@ -151,11 +151,6 @@ public class FilterFactory {
                     final CharacterLostSkirmishResult lostSkirmish = (CharacterLostSkirmishResult) actionContext.getEffectResult();
                     return lostSkirmish.getLoser();
                 });
-        simpleFilters.put("skirmishwinner",
-                (actionContext) -> {
-                    final CharacterWonSkirmishResult lostSkirmish = (CharacterWonSkirmishResult) actionContext.getEffectResult();
-                    return lostSkirmish.getWinner();
-                });
         simpleFilters.put("storedculture",
                 (actionContext) -> (Filter) (game, physicalCard) -> {
                     PhysicalCard.WhileInZoneData data = actionContext.getSource().getWhileInZoneData();