diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
index 4e0d62229..034cb14ec 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
@@ -27,6 +27,7 @@
     "culture": "gandalf",
     "cost": 2,
     "type": "artifact",
+    "possession": "staff",
     "vitality": 1,
     "target": "name(Gandalf)",
     "effects": [
@@ -263,6 +264,7 @@
       "type": "event",
       "effect": {
         "type": "removeKeyword",
+        "keyword": "fierce",
         "until": "start(regroup)",
         "filter": "choose(minion)"
       }
@@ -290,4 +292,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java
index 3235c9460..224597350 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseYesOrNo.java
@@ -3,6 +3,7 @@ package com.gempukku.lotro.cards.build.field.effect.appender;
 import com.gempukku.lotro.cards.build.ActionContext;
 import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
 import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
+import com.gempukku.lotro.cards.build.PlayerSource;
 import com.gempukku.lotro.cards.build.field.FieldUtils;
 import com.gempukku.lotro.cards.build.field.effect.EffectAppender;
 import com.gempukku.lotro.cards.build.field.effect.EffectAppenderProducer;
@@ -16,7 +17,7 @@ import org.json.simple.JSONObject;
 public class ChooseYesOrNo implements EffectAppenderProducer {
     @Override
     public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
-        FieldUtils.validateAllowedFields(effectObject, "text", "memorize", "yes", "no");
+        FieldUtils.validateAllowedFields(effectObject, "text", "player", "memorize", "yes", "no");
 
         final String text = FieldUtils.getString(effectObject.get("text"), "text");
         if (text == null)
@@ -24,11 +25,12 @@ public class ChooseYesOrNo implements EffectAppenderProducer {
         final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize");
         final String yesAnswer = FieldUtils.getString(effectObject.get("yes"), "yes");
         final String noAnswer = FieldUtils.getString(effectObject.get("no"), "no");
+        PlayerSource playerSource = PlayerResolver.resolvePlayer(FieldUtils.getString(effectObject.get("player"), "player", "you"), environment);
 
         return new DelayedAppender() {
             @Override
             protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
-                return new PlayoutDecisionEffect(actionContext.getPerformingPlayer(),
+                return new PlayoutDecisionEffect(playerSource.getPlayer(actionContext),
                         new YesNoDecision(text) {
                             @Override
                             protected void yes() {