diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/AddsCultureToken.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/AddsCultureToken.java
index a84f1100a..d125a4d39 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/AddsCultureToken.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/AddsCultureToken.java
@@ -17,7 +17,7 @@ public class AddsCultureToken implements TriggerCheckerProducer {
 
         final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(filter, environment);
         final FilterableSource onSourceFilter = environment.getFilterFactory().generateFilter(onFilter, environment);
-        PlayerSource playerSource = player != null ? PlayerResolver.resolvePlayer(player, environment) : null;
+        PlayerSource playerSource = player != null ? PlayerResolver.resolvePlayer(player) : null;
 
         return new TriggerChecker() {
             @Override
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/RemovesCultureToken.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/RemovesCultureToken.java
index 34f370ffd..dd04565b4 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/RemovesCultureToken.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/RemovesCultureToken.java
@@ -15,7 +15,7 @@ public class RemovesCultureToken implements TriggerCheckerProducer {
         String onFilter = FieldUtils.getString(value.get("on"), "on", "any");
         String filter = FieldUtils.getString(value.get("filter"), "filter", "any");
 
-        PlayerSource playerSource = (player != null) ? PlayerResolver.resolvePlayer(player, environment) : null;
+        PlayerSource playerSource = (player != null) ? PlayerResolver.resolvePlayer(player) : null;
         final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(filter, environment);
         final FilterableSource onSourceFilter = environment.getFilterFactory().generateFilter(onFilter, environment);
 
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java
index 55ffcb9e5..1df4a5123 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java
@@ -81,6 +81,9 @@ public class Card_V2_024_Tests
 		assertTrue(scn.ShadowPlayAvailable(pit));
 		scn.ShadowPlayCard(pit);
 
+		assertTrue(scn.ShadowHasOptionalTriggerAvailable());
+		scn.ShadowAcceptOptionalTrigger();
+
 		assertTrue(scn.ShadowDecisionAvailable("Choose action to perform"));
 		scn.ShadowChooseMultipleChoiceOption("discard");
 
@@ -121,6 +124,9 @@ public class Card_V2_024_Tests
 		assertTrue(scn.ShadowPlayAvailable(pit));
 		scn.ShadowPlayCard(pit);
 
+		assertTrue(scn.ShadowHasOptionalTriggerAvailable());
+		scn.ShadowAcceptOptionalTrigger();
+
 		assertTrue(scn.ShadowDecisionAvailable("Choose action to perform"));
 		scn.ShadowChooseMultipleChoiceOption("deck");
 
@@ -162,6 +168,9 @@ public class Card_V2_024_Tests
 		assertTrue(scn.ShadowPlayAvailable(pit));
 		scn.ShadowPlayCard(pit);
 
+		assertTrue(scn.ShadowHasOptionalTriggerAvailable());
+		scn.ShadowAcceptOptionalTrigger();
+
 		assertTrue(scn.ShadowDecisionAvailable("Choose action to perform"));
 		scn.ShadowChooseMultipleChoiceOption("deck");