diff --git a/changelog.md b/changelog.md
index 4f89e0e..551cf89 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 v1.14.21:
 
 - Increased maximum scale/zoom to 400%, by request.
+- Fixed TargetCC/FocusCC modules on Wrath Classic.
 
 v1.14.20:
 
diff --git a/modules/TargetCC.lua b/modules/TargetCC.lua
index be1bca9..3d3bc7b 100644
--- a/modules/TargetCC.lua
+++ b/modules/TargetCC.lua
@@ -360,7 +360,7 @@ function TargetCC.prototype:GetMaxDebuffDuration(unitName, debuffNames)
 	while debuff do
 		remaining = endTime - GetTime()
 
-		if debuffNames[spellId] and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
+		if (debuffNames[spellId] or debuffNames[debuff]) and (not self.moduleSettings.onlyShowForMyDebuffs or isMine) then
 			if result[0] then
 				if result[2] < remaining then
 					result = {debuff, duration, remaining}
diff --git a/this_version.md b/this_version.md
index d651349..ea6a5a8 100644
--- a/this_version.md
+++ b/this_version.md
@@ -3,6 +3,7 @@
 v1.14.21:
 
 - Increased maximum scale/zoom to 400%, by request.
+- Fixed TargetCC/FocusCC modules on Wrath Classic.
 
 v1.14.20: