diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index ba7f17da609..67792738d2b 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -109,7 +109,7 @@
 
 /obj/item/weapon/twohanded/equipped(mob/user, slot)
 	..()
-	if(slot != slot_l_hand && slot != slot_r_hand && wielded)
+	if(!user.is_holding(src) && wielded)
 		unwield(user)
 
 ///////////OFFHAND///////////////
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 2d831483647..eb9e319ee09 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -172,7 +172,7 @@
 		prepared = TRUE
 		user << "<span class='notice'>You prepare [src].</span>"
 		var/obj/item/ash_flora/A = new prepared_type(get_turf(src))
-		if(src in get_both_hands(user))
+		if(user.is_holding(src))
 			user.unEquip(src, TRUE)
 			user.put_in_hands(A)
 		qdel(src)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 993ac2b2d57..066ae8d47a7 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -829,7 +829,7 @@
 		else
 			user << "<span class='warning'>You need to be on solid ground to produce a rune!</span>"
 		return
-	if(src != user.l_hand && src != user.r_hand) //you need to hold the staff to teleport
+	if(!user.is_holding(src)) //you need to hold the staff to teleport
 		user << "<span class='warning'>You need to hold the staff in your hands to [rune ? "teleport with it":"create a rune"]!</span>"
 		return
 	if(get_dist(user, rune) <= 2) //rune too close abort