diff --git a/Moose Development/Moose/Functional/Tiresias.lua b/Moose Development/Moose/Functional/Tiresias.lua
index a459bacf0..1e1e46ae5 100644
--- a/Moose Development/Moose/Functional/Tiresias.lua	
+++ b/Moose Development/Moose/Functional/Tiresias.lua	
@@ -310,8 +310,8 @@ function TIRESIAS:_InitGroups()
           AIOff = SwitchAAA,
         }
       end
-      if grp.Tiresias and (grp.Tiresias.exception == false) then
-        if  grp.Tiresias.invisible and grp.Tiresias.invisible == false then
+      if grp.Tiresias and (not grp.Tiresias.exception == true) then
+        if grp.Tiresias.invisible == false then
           grp:SetCommandInvisible(true)
           grp.Tiresias.invisible = true
           if SwitchAAA then
@@ -338,10 +338,11 @@ function TIRESIAS:_InitGroups()
         }
       end
       if grp.Tiresias and (not grp.Tiresias.exception == true) then
-        if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then
+        if grp.Tiresias and grp.Tiresias.invisible == false then
           grp:SetCommandInvisible(true)
           grp:SetAIOff()
           grp.Tiresias.invisible = true
+          grp.Tiresias.AIOff = true
         end
       end     
       --BASE:I(string.format("Init/Switch off Vehicle %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
@@ -359,8 +360,8 @@ function TIRESIAS:_InitGroups()
           AIOff = SwitchSAM,
         }
       end
-      if grp.Tiresias and (grp.Tiresias.exception == false) then
-        if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then
+      if grp.Tiresias and (not grp.Tiresias.exception == true) then
+        if grp.Tiresias and grp.Tiresias.invisible == false then
           grp:SetCommandInvisible(true)
           grp.Tiresias.invisible = true
           grp:SetAIOnOff(SwitchSAM)
@@ -421,7 +422,8 @@ function TIRESIAS:_SwitchOnGroups(group,radius)
     ground:ForEachGroupAlive(
       function(grp)
         local name = grp:GetName()
-        if grp.Tiresias and grp.Tiresias.exception and (grp.Tiresias.exception == false ) then
+        if grp:GetCoalition() ~= group:GetCoalition()
+                            and grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then
           if grp.Tiresias.invisible == true then
             grp:SetCommandInvisible(false)
             grp.Tiresias.invisible = false
diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua
index b777054fe..0533e13b0 100644
--- a/Moose Development/Moose/Ops/Awacs.lua	
+++ b/Moose Development/Moose/Ops/Awacs.lua	
@@ -1773,7 +1773,7 @@ function AWACS:_EventHandler(EventData)
     end
   end
   
-  if Event.id == EVENTS.PlayerLeaveUnit then --player left unit
+  if Event.id == EVENTS.PlayerLeaveUnit and Event.IniGroupName then --player left unit
     -- check known player?
     self:T("Player group left  unit: " .. Event.IniGroupName)
     self:T("Player name left: " .. Event.IniPlayerName)