diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 8af585f13ef..04ec3380004 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -312,7 +312,7 @@
 				//	continue
 				if(!AM.simulated)
 					continue
-				if(istype(AM, /mob/observer/eye/aiEye))
+				if(isobserver(AM) || isEye(AM))
 					continue
 				if(isliving(AM))
 					var/mob/living/bug = AM