diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 69b87d55597..68ba488fe7b 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -462,9 +462,10 @@ var/list/rot13_lookup = list()
 	var/t_out = ""
 
 	for(var/i in 1 to length(t_in))
-		if(i in rot13_lookup)
-			t_out += rot13_lookup[i]
+		var/char = copytext(t_in, i, i + 1)
+		if(char in rot13_lookup)
+			t_out += rot13_lookup[char]
 		else
-			t_out += i
+			t_out += char
 
 	return t_out
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index cbb5f38e8e1..4c8f6125d6d 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -138,7 +138,7 @@ var/list/GPS_list = list()
 		// I assume it's faster to color,tag and OR the turf in, rather
 		// then checking if its there
 		T.color = RANDOM_COLOUR
-		T.maptext = "[x],[y],[z]"
+		T.maptext = "[T.x],[T.y],[T.z]"
 		tagged |= T
 
 /obj/item/device/gps/visible_debug/proc/clear()