diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index c2b33e30083..c1d1b85dfee 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -31,8 +31,8 @@
 
 /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/tank/internals))
-		if(!iscarbon(loc))
-			to_chat(user, "<span class='warning'>You have to hold the powerfist in your hand!</span>")
+		if(!user.is_holding(src))
+			to_chat(user, "<span class='warning'>You have to hold [src] in your hand!</span>")
 			return
 		if(!tank)
 			var/obj/item/tank/internals/IT = W