diff --git a/Categories/Characteristics.lua b/Categories/Characteristics.lua
index c60b179..fcf526f 100644
--- a/Categories/Characteristics.lua
+++ b/Categories/Characteristics.lua
@@ -19,6 +19,7 @@ local L = DogTag_Unit.L
 
 -- Pre 3.2.0 compatability support
 local wow_320 = select(4, GetBuildInfo()) >= 30200
+local wow_700 = select(4, GetBuildInfo()) >= 70000
 local GetQuestDifficultyColor
 if not wow_320 then
 	GetQuestDifficultyColor = _G.GetDifficultyColor
@@ -544,7 +545,7 @@ DogTag:AddTag("Unit", "HostileColor", {
 				-- either enemy or friend, no violence
 				r, g, b = unpack(DogTag.__colors.civilian)
 			end
-		elseif (UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit)) or UnitIsDead(unit) then
+		elseif (not wow_700 and UnitIsTapped(unit) and not UnitIsTappedByPlayer(unit)) or UnitIsDead(unit) then
 			r, g, b = unpack(DogTag.__colors.tapped)
 		else
 			local reaction = UnitReaction(unit, "player")
diff --git a/Categories/Status.lua b/Categories/Status.lua
index 017f327..bd5bb8f 100644
--- a/Categories/Status.lua
+++ b/Categories/Status.lua
@@ -29,7 +29,7 @@ local wow_ver = select(4, GetBuildInfo())
 local wow_400 = wow_ver >= 40000
 local wow_500 = wow_ver >= 50000
 local wow_600 = wow_ver >= 60000
-local wow_700 = wow_ver >= 60000
+local wow_700 = wow_ver >= 70000
 local petHappinessEvent = "UNIT_HAPPINESS"
 if wow_400 then
 	petHappinessEvent = "UNIT_POWER"