diff --git a/res/cardsfolder/r/remote_farm.txt b/res/cardsfolder/r/remote_farm.txt
index d630d85a69b..774912cdefc 100644
--- a/res/cardsfolder/r/remote_farm.txt
+++ b/res/cardsfolder/r/remote_farm.txt
@@ -2,9 +2,8 @@ Name:Remote Farm
 ManaCost:no cost
 Types:Land
 Text:no text
-K:ETBReplacement:Other:ETBTap
+K:CARDNAME enters the battlefield tapped.
 K:ETBReplacement:Other:ETBCounters
-SVar:ETBTap:DB$ Tap | Defined$ Self | ETB$ True | SpellDescription$ CARDNAME enters the battlefield tapped. 
 SVar:ETBCounters:DB$ PutCounter | Defined$ Self | CounterType$ DEPLETION | CounterNum$ 2 | SpellDescription$ CARDNAME enters the battlefield with 2 depletion counters on it.
 A:AB$ Mana | Cost$ T SubCounter<1/DEPLETION> | Produced$ W | Deplete$ DEPLETION | Amount$ 2 | SpellDescription$ Add W W to your mana pool. If there are no depletion counters on CARDNAME, sacrifice it.
 SVar:RemAIDeck:True
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
index 1dd4556d6a3..f725b9abbc5 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
@@ -757,7 +757,7 @@ public class AbilityFactoryCounters {
                 final Zone zone = Singletons.getModel().getGame().getZoneOf(tgtCard);
                 if (zone == null) {
                     // Do nothing, token disappeared
-                } else if (zone.is(ZoneType.Battlefield)) {
+                } else if (zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Stack)) {
                     tgtCard.addCounter(Counters.valueOf(type), counterAmount);
                 } else {
                     // adding counters to something like re-suspend cards
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
index 3bccb184f24..e5c72a4a0b2 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
@@ -1241,7 +1241,11 @@ public class AbilityFactoryPermanentState {
         }
 
         for (final Card tgtC : tgtCards) {
-            if ((tgtC.isInPlay() || params.containsKey("ETB")) && ((tgt == null) || tgtC.canBeTargetedBy(sa))) {
+            if (tgt != null && !tgtC.canBeTargetedBy(sa)) {
+                continue;
+            }
+            
+            if (params.containsKey("ETB") || tgtC.isInPlay()) {
                 if (tgtC.isUntapped() && (remTapped)) {
                     card.addRemembered(tgtC);
                 }