diff --git a/Mage.Sets/src/mage/cards/b/BrassGnat.java b/Mage.Sets/src/mage/cards/b/BrassGnat.java
index 3e61dccac2f..2d490f3001e 100644
--- a/Mage.Sets/src/mage/cards/b/BrassGnat.java
+++ b/Mage.Sets/src/mage/cards/b/BrassGnat.java
@@ -3,6 +3,8 @@ package mage.cards.b;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.condition.common.SourceTappedCondition;
+import mage.abilities.hint.ConditionHint;
 import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
@@ -35,6 +37,7 @@ public final class BrassGnat extends CardImpl {
         // At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Gnat.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(
                 new DoIfCostPaid(new UntapSourceEffect(), new GenericManaCost(1))
+                        .withChooseHint(new ConditionHint(SourceTappedCondition.UNTAPPED))
         ));
     }
 
diff --git a/Mage.Sets/src/mage/cards/b/BrassMan.java b/Mage.Sets/src/mage/cards/b/BrassMan.java
index 5e56a966663..b268ffdcef0 100644
--- a/Mage.Sets/src/mage/cards/b/BrassMan.java
+++ b/Mage.Sets/src/mage/cards/b/BrassMan.java
@@ -3,6 +3,8 @@ package mage.cards.b;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.condition.common.SourceTappedCondition;
+import mage.abilities.hint.ConditionHint;
 import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
@@ -33,6 +35,7 @@ public final class BrassMan extends CardImpl {
         // At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Man.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(
                 new DoIfCostPaid(new UntapSourceEffect(), new GenericManaCost(1))
+                        .withChooseHint(new ConditionHint(SourceTappedCondition.UNTAPPED))
         ));
     }
 
diff --git a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java
index 07235b2eb4c..e8502c803e8 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java
@@ -3,6 +3,8 @@ package mage.cards.g;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.condition.common.SourceTappedCondition;
+import mage.abilities.hint.ConditionHint;
 import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@@ -34,7 +36,9 @@ public final class GoblinDirigible extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()));
         // At the beginning of your upkeep, you may pay {4}. If you do, untap Goblin Dirigible.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(
-            new UntapSourceEffect(), new ManaCostsImpl<>("{4}"))));
+            new UntapSourceEffect(), new ManaCostsImpl<>("{4}"))
+                .withChooseHint(new ConditionHint(SourceTappedCondition.UNTAPPED))
+        ));
     }
 
     private GoblinDirigible(final GoblinDirigible card) {
diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java
index cacd4bd1d4a..0eaf8a07f99 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java
@@ -3,6 +3,8 @@ package mage.cards.g;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.condition.common.SourceTappedCondition;
+import mage.abilities.hint.ConditionHint;
 import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
@@ -31,7 +33,8 @@ public final class GoblinWarWagon extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()));
         // At the beginning of your upkeep, you may pay {2}. If you do, untap Goblin War Wagon.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(
-            new UntapSourceEffect(), new ManaCostsImpl<>("{2}"))));
+            new UntapSourceEffect(), new ManaCostsImpl<>("{2}"))
+                .withChooseHint(new ConditionHint(SourceTappedCondition.UNTAPPED))));
     }
 
     private GoblinWarWagon(final GoblinWarWagon card) {
diff --git a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java
index bd0914f927b..17db2f7954f 100644
--- a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java
+++ b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java
@@ -3,6 +3,8 @@ package mage.cards.i;
 
 import java.util.UUID;
 import mage.MageInt;
+import mage.abilities.condition.common.SourceTappedCondition;
+import mage.abilities.hint.ConditionHint;
 import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
@@ -35,6 +37,7 @@ public final class IslandFishJasconius extends CardImpl {
         // At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Island Fish Jasconius.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(
                 new DoIfCostPaid(new UntapSourceEffect(), new ManaCostsImpl<>("{U}{U}{U}"))
+                        .withChooseHint(new ConditionHint(SourceTappedCondition.UNTAPPED))
         ));
         
         // Island Fish Jasconius can't attack unless defending player controls an Island.