diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index b739112e5f0..1585302f64b 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1069,7 +1069,7 @@ datum/mind
 		else if (href_list["common"])
 			switch(href_list["common"])
 				if("undress")
-					if(istype(current, /mob/living/carbon/human))
+					if(ishuman(current))
 						var/mob/living/carbon/human/H = current
 						// Don't "undress" organs right out of the body
 						for(var/obj/item/W in H.contents - (H.organs | H.internal_organs))
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 2a742489a31..3f2e4d0f245 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -162,7 +162,7 @@ proc/wabbajack(mob/living/M)
 					new_mob.job = "Cyborg"
 					var/mob/living/silicon/robot/Robot = new_mob
 					Robot.mmi = new /obj/item/device/mmi(new_mob)
-					if(istype(M, /mob/living/carbon/human))
+					if(ishuman(M))
 						Robot.mmi.transfer_identity(M)	//Does not transfer key/client.
 				if("slime")
 					new_mob = new /mob/living/carbon/slime(M.loc)