diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index b77c575925..c3e8d10ec8 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -584,13 +584,7 @@
 
 	var/list/mob_list = list()
 	for(var/mob/living/silicon/ai/M in world)
-		if(ticker)
-			if(ticker.mode == "AI malfunction")
-				var/datum/game_mode/malfunction/malf = ticker.mode
-				for (var/datum/mind/B in malf.malf_ai)
-					if (M.mind == B)
-					else mob_list.Add(M)
-			else mob_list.Add(M)
+		mob_list.Add(M)
 	for(var/mob/living/silicon/robot/M in world)
 		mob_list.Add(M)
 	for(var/mob/living/carbon/human/M in world)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 64a1f64d2f..c72de30af9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1323,7 +1323,7 @@
 			names.Add(name)
 			namecounts[name] = 1
 		creatures[name] = B
-
+/*
 	for (var/mob/living/silicon/decoy/D in world)
 		var/name = "[D.name]"
 		if (name in names)
@@ -1333,7 +1333,7 @@
 			names.Add(name)
 			namecounts[name] = 1
 		creatures[name] = D
-
+*/
 
 
 
@@ -1365,6 +1365,16 @@
 			src.reset_view(null)
 			client.adminobs = 0
 	else
+		if(ticker)
+//		 world << "there's a ticker"
+			if(ticker.mode.name == "AI malfunction")
+//				world << "ticker says its malf"
+				var/datum/game_mode/malfunction/malf = ticker.mode
+				for (var/datum/mind/B in malf.malf_ai)
+//					world << "comparing [B.current] to [eye]"
+					if (B.current == eye)
+						for (var/mob/living/silicon/decoy/D in world)
+							eye = D
 		if (eye)
 			src.client.eye = eye
 		else