diff --git a/Source/Game/AI/ScriptedAI/ScriptedAI.cs b/Source/Game/AI/ScriptedAI/ScriptedAI.cs
index 8387c6d92..e6cc0ed6f 100644
--- a/Source/Game/AI/ScriptedAI/ScriptedAI.cs
+++ b/Source/Game/AI/ScriptedAI/ScriptedAI.cs
@@ -233,12 +233,14 @@ namespace Game.AI
             AllCreaturesOfEntryInRange check = new(me, entry, maxSearchRange);
             CreatureListSearcher searcher = new(me, creatures, check);
 
-            // TODO: FIX THIS
-            //if (!samePhase)
-            //    searcher.i_phaseMask = PHASEMASK_ANYWHERE;
+            if (!samePhase)
+                PhasingHandler.SetAlwaysVisible(me, true, false);
 
             Cell.VisitGridObjects(me, searcher, maxSearchRange);
 
+            if (!samePhase)
+                PhasingHandler.SetAlwaysVisible(me, false, false);
+
             foreach (Creature creature in creatures)
                 ForceCombatStop(creature, reset);
         }