diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gandalf.hjson
index a68b8ba5c..a17e06232 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gandalf.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_gandalf.hjson
@@ -412,11 +412,8 @@
 			{
 				type: activated
 				phase: regroup
+				limitPerPhase: 2
 				requires: [
-					{
-						type: perPhaseLimit
-						limit: 2
-					}
 					{
 						type: canSpot
 						count: 2
@@ -429,21 +426,8 @@
 					count: 2
 				}
 				effect: {
-					type: If
-					check: {
-						type: perPhaseLimit
-						limit: 2
-					}
-					true: [
-						{
-							type: incrementPerPhaseLimit
-							limit: 1
-						}
-						{
-							type: heal
-							select: choose(companion,or(name(Gandalf),signet(gandalf)))
-						}
-					]
+					type: heal
+					select: choose(companion,or(name(Gandalf),signet(gandalf)))
 				}
 			}
 		]
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
index 9c876195f..2bb6a7f59 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
@@ -252,6 +252,12 @@ public class GenericCardTestHelper extends AbstractAtTest {
     public AwaitingDecision FreepsGetAwaitingDecision() { return GetAwaitingDecision(P1); }
     public AwaitingDecision ShadowGetAwaitingDecision() { return GetAwaitingDecision(P2); }
     public AwaitingDecision GetAwaitingDecision(String playerID) { return _userFeedback.getAwaitingDecision(playerID); }
+    public AwaitingDecision GetCurrentDecision() {
+        var freeps = FreepsGetAwaitingDecision();
+        if(freeps != null)
+            return freeps;
+        return ShadowGetAwaitingDecision();
+    }
 
     public Boolean FreepsDecisionAvailable(String text) { return DecisionAvailable(P1, text); }
     public Boolean ShadowDecisionAvailable(String text) { return DecisionAvailable(P2, text); }
@@ -751,7 +757,7 @@ public class GenericCardTestHelper extends AbstractAtTest {
             ShadowDeclineReconciliation();
         }
         while(ShadowDecisionAvailable("discard down")) {
-            ShadowChooseCard((PhysicalCardImpl) GetShadowHand().get(0));
+            ShadowChooseCard((PhysicalCardImpl) GetShadowHand().getFirst());
         }
     }
     public void SkipToPhase(Phase target) throws DecisionResultInvalidException {
@@ -768,7 +774,17 @@ public class GenericCardTestHelper extends AbstractAtTest {
                 ShadowPassCurrentPhaseAction();
             }
             else {
-                PassCurrentPhaseActions();
+                var freeps = FreepsGetAwaitingDecision();
+                var shadow = ShadowGetAwaitingDecision();
+                if(freeps != null && freeps.getText().toLowerCase().contains("required")) {
+                    FreepsChooseAction("0");
+                }
+                else if(shadow != null && shadow.getText().toLowerCase().contains("required")){
+                    ShadowChooseAction("0");
+                }
+                else {
+                    PassCurrentPhaseActions();
+                }
             }
 
             if(attempts == 20)
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_018_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_018_Tests.java
index 5787e3b84..4a2fde3d6 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_018_Tests.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_018_Tests.java
@@ -177,8 +177,9 @@ public class Card_V1_018_Tests
 		//limit of 2 means it won't let us even with healthy allies
 		assertEquals(1, scn.GetWoundsOn(galadriel));
 		assertEquals(2, scn.GetWoundsOn(elrond));
-		assertTrue(scn.FreepsActionAvailable(council));
+		assertFalse(scn.FreepsActionAvailable(council));
 
+		scn.SkipToSite(3);
 		scn.SkipToPhase(Phase.REGROUP);
 
 		assertTrue(scn.FreepsActionAvailable(council));