diff --git a/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua b/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua
index c2d6d60..78b9f1c 100644
--- a/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua
+++ b/ATAutoReactivateGoliath/ATAutoReactivateGoliath.lua
@@ -15,8 +15,11 @@ StaticPopupDialogs["GOLIATH_MISSING"] = {
 f:RegisterEvent("GOSSIP_SHOW")
 
 f:SetScript("OnEvent", function(self, event, ...)
-  local isNecroticWake = GetZoneText() == "The Necrotic Wake"
-  local isSteward = GetUnitName("npc") == "Steward"
+  -- check if The Necrotic Wake
+  local isNecroticWake = C_Map.GetBestMapForUnit("player") == 1666
+  -- check if Steward
+  local guid = UnitGUID("npc")
+  local isSteward = tonumber(guid and strsub(guid, 27, 32)) == 166663
 
   if isNecroticWake and isSteward then
     options = C_GossipInfo.GetOptions()