diff --git a/Categories/Characteristics.lua b/Categories/Characteristics.lua
index a9363ff..ed1ade9 100644
--- a/Categories/Characteristics.lua
+++ b/Categories/Characteristics.lua
@@ -181,11 +181,17 @@ local function Class(unit)
 	if UnitIsPlayer(unit) then
 		return UnitClass(unit) or UNKNOWN
 	else
-		if wow_800 or WOW_PROJECT_ID then
-			local classbase, classindex = UnitClassBase(unit)
+		local classbase, classindex = UnitClassBase(unit)
+		if (wow_800 or WOW_PROJECT_ID) and GetClassInfo then
 			return classbase and GetClassInfo(classindex) or UNKNOWN
+		elseif LOCALIZED_CLASS_NAMES_MALE and LOCALIZED_CLASS_NAMES_FEMALE then
+			if UnitSex(unit) == 3 then
+				return LOCALIZED_CLASS_NAMES_FEMALE[classbase] or UNKNOWN
+			else
+				return LOCALIZED_CLASS_NAMES_MALE[classbase] or UNKNOWN
+			end
 		else
-			return UnitClassBase(unit) or UNKNOWN
+			return classbase or UNKNOWN
 		end
 	end
 end