diff --git a/Mage.Sets/src/mage/cards/w/WoodlandGuidance.java b/Mage.Sets/src/mage/cards/w/WoodlandGuidance.java
index 10b34414b0a..ef33d66db3a 100644
--- a/Mage.Sets/src/mage/cards/w/WoodlandGuidance.java
+++ b/Mage.Sets/src/mage/cards/w/WoodlandGuidance.java
@@ -1,4 +1,3 @@
-
 package mage.cards.w;
 
 import java.util.UUID;
@@ -19,6 +18,8 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 public final class WoodlandGuidance extends CardImpl {
 
+    private static final FilterLandPermanent filter = new FilterLandPermanent(SubType.FOREST, "Forests");
+
     public WoodlandGuidance(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}");
 
@@ -27,7 +28,7 @@ public final class WoodlandGuidance extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard());
 
         // Clash with an opponent. If you win, untap all Forest you control
-        this.getSpellAbility().addEffect(new DoIfClashWonEffect(new UntapAllLandsControllerEffect(new FilterLandPermanent(SubType.FOREST, "Forests"))));
+        this.getSpellAbility().addEffect(new DoIfClashWonEffect(new UntapAllLandsControllerEffect(filter)));
 
         // Remove WoodlandGuidance from the game 
         this.getSpellAbility().addEffect(new ExileSpellEffect().concatBy("<br>"));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java
index 61b44926f0c..b32858f6808 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapAllLandsControllerEffect.java
@@ -1,9 +1,9 @@
-
 package mage.abilities.effects.common;
 
 import mage.constants.Outcome;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterLandPermanent;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -17,14 +17,7 @@ public class UntapAllLandsControllerEffect extends OneShotEffect {
     private final FilterLandPermanent filter;
 
     public UntapAllLandsControllerEffect() {
-        super(Outcome.Untap);
-        staticText = "Untap all lands you control";
-        filter = new FilterLandPermanent();
-    }
-
-    protected UntapAllLandsControllerEffect(final UntapAllLandsControllerEffect effect) {
-        super(effect);
-        this.filter = effect.filter;
+        this(StaticFilters.FILTER_LANDS);
     }
 
     public UntapAllLandsControllerEffect(FilterLandPermanent filter) {
@@ -33,6 +26,11 @@ public class UntapAllLandsControllerEffect extends OneShotEffect {
         this.filter = filter;
     }
 
+    protected UntapAllLandsControllerEffect(final UntapAllLandsControllerEffect effect) {
+        super(effect);
+        this.filter = effect.filter;
+    }
+
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());