diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index 9eac5e08..d3e9d862 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -182,9 +182,11 @@
 	set name = "pAI Suicide"
 	var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No")
 	if(answer == "Yes")
-		var/obj/item/device/paicard/card = loc
+//		var/obj/item/device/paicard/card = loc //Why?
 		card.removePersonality()
-		var/turf/T = get_turf_or_move(card.loc)
+		if(src.loc != card)
+			close_up()
+		var/turf/T = get_turf(card)
 		for (var/mob/M in viewers(T))
 			M.show_message("\blue [src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "\blue [src] bleeps electronically.", 2)
 		death(0)