diff --git a/Mage.Sets/src/mage/sets/kaladesh/CombustibleGearhulk.java b/Mage.Sets/src/mage/sets/kaladesh/CombustibleGearhulk.java
index a2285a7cda..d5645ae139 100644
--- a/Mage.Sets/src/mage/sets/kaladesh/CombustibleGearhulk.java
+++ b/Mage.Sets/src/mage/sets/kaladesh/CombustibleGearhulk.java
@@ -65,7 +65,8 @@ public class CombustibleGearhulk extends CardImpl {
 
         // When Combustible Gearhulk enters the battlefield, target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then Combustible Gearhulk deals damage to that player equal to the total converted mana cost of those cards.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CombustibleGearhulkEffect(), false);
-        ability.addTarget(new TargetOpponent());
+
+        ability.addTarget(new TargetOpponent(false));
         this.addAbility(ability);
     }
 
@@ -83,6 +84,7 @@ class CombustibleGearhulkEffect extends OneShotEffect {
 
     public CombustibleGearhulkEffect() {
         super(Outcome.AIDontUseIt);
+        staticText = "target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then {this} deals damage to that player equal to the total converted mana cost of those cards";
     }
 
     public CombustibleGearhulkEffect(final CombustibleGearhulkEffect effect) {
diff --git a/Mage.Sets/src/mage/sets/masterpieceseries/CombustibleGearhulk.java b/Mage.Sets/src/mage/sets/masterpieceseries/CombustibleGearhulk.java
index 15fa52f5a9..60ba3756c1 100644
--- a/Mage.Sets/src/mage/sets/masterpieceseries/CombustibleGearhulk.java
+++ b/Mage.Sets/src/mage/sets/masterpieceseries/CombustibleGearhulk.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 
 /**
  *
- * @author anonymous
+ * @author spjspj
  */
 public class CombustibleGearhulk extends mage.sets.kaladesh.CombustibleGearhulk {