diff --git a/LibDogTag-Unit-3.0.lua b/LibDogTag-Unit-3.0.lua
index 0b45538..f7789bb 100644
--- a/LibDogTag-Unit-3.0.lua
+++ b/LibDogTag-Unit-3.0.lua
@@ -129,11 +129,9 @@ for i = 1, 4 do
 	IsLegitimateUnit["party" .. i] = true
 	IsLegitimateUnit["partypet" .. i] = true
 	IsLegitimateUnit["party" .. i .. "pet"] = true
-	IsLegitimateUnit["boss" .. i] = true
 	IsNormalUnit["party" .. i] = true
 	IsNormalUnit["partypet" .. i] = true
 	IsNormalUnit["party" .. i .. "pet"] = true
-	IsNormalUnit["boss" .. i] = true
 	WACKY_UNITS["party" .. i .. "target"] = true
 	WACKY_UNITS["partypet" .. i .. "target"] = true
 	WACKY_UNITS["party" .. i .. "pettarget"] = true
@@ -152,6 +150,12 @@ for i = 1, 40 do
 	WACKY_UNITS["raidpet" .. i .. "target"] = true
 	WACKY_UNITS["raid" .. i .. "pettarget"] = true
 end
+for i = 1, MAX_BOSS_FRAMES do
+	IsLegitimateUnit["boss" .. i] = true
+	IsNormalUnit["boss" .. i] = true
+	WACKY_UNITS["boss" .. i .. "target"] = true
+	WACKY_UNITS["boss" .. i .. "targettarget"] = true
+end
 setmetatable(IsLegitimateUnit, { __index = function(self, key)
 	if type(key) ~= "string" then
 		return false
@@ -441,7 +445,7 @@ DogTag:AddEventHandler("Unit", "UPDATE_MOUSEOVER_UNIT", function(event, ...)
 end)
 
 DogTag:AddEventHandler("Unit", "INSTANCE_ENCOUNTER_ENGAGE_UNIT", function(event, ...)
-	for i = 1, 4 do
+	for i = 1, MAX_BOSS_FRAMES do
 		refreshGUID("boss"..i)
 		DogTag:FireEvent("UnitChanged", "boss"..i)
 	end