diff --git a/res/cards.txt b/res/cards.txt
index 506cf713783..cc12bef614c 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -222,6 +222,12 @@ Artifact Equipment
 Equipped creature gets +1/+0.
 eqPump 0:+1/+0
 
+Skullclamp
+1
+Artifact Equipment
+Equipped creature gets +1/-1. When equipped creature is put into a graveyard, draw two cards.
+eqPump 1:+1/-1
+
 Slagwurm Armor
 1
 Artifact Equipment
@@ -7885,11 +7891,6 @@ At the beginning of each upkeep, put a 1/1 red and green Dragon creature token w
 4/4
 Flying
 
-Skullclamp
-1
-Artifact Equipment
-Equipped creature gets +1/-1. When equipped creature is put into a graveyard, draw two cards.
-
 Survival of the Fittest
 1 G
 Enchantment
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 5fd882ea563..d87cc3fc62e 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -1269,7 +1269,8 @@ public class CardFactoryUtil {
                     public boolean addCard(Card c) {
                         return c.isCreature() && (!CardFactoryUtil.AI_doesCreatureAttack(c))
                                 && CardFactoryUtil.canTarget(sourceCard, c)
-                                && (!c.getKeyword().contains("Defender"));
+                                && (!c.getKeyword().contains("Defender"))
+                                && (c.getNetDefense() + Tough > 0);
                     }
                 });
                 // list.remove(card);      // if mana-only cost, allow self-target
diff --git a/src/forge/CardFactory_Equipment.java b/src/forge/CardFactory_Equipment.java
index f73f5e46b24..80987b91262 100644
--- a/src/forge/CardFactory_Equipment.java
+++ b/src/forge/CardFactory_Equipment.java
@@ -471,7 +471,7 @@ class CardFactory_Equipment {
         } //*************** END ************ END **************************
         
 
-
+/*
         //*************** START *********** START **************************
         else if(cardName.equals("Skullclamp")) {
             final Ability equip = new Ability(card, "1") {
@@ -577,7 +577,7 @@ class CardFactory_Equipment {
             card.addUnEquipCommand(onUnEquip);
             
         } //*************** END ************ END **************************
-    	
+*/
         
 /*
         //*************** START *********** START **************************