diff --git a/spells/priest.lua b/spells/priest.lua
index 789ae09..4b5f9ae 100644
--- a/spells/priest.lua
+++ b/spells/priest.lua
@@ -27,14 +27,14 @@ function getPriestSpells()
 		[19284] = { name = L["hex of weakness"], rank = 5, duration = 120 },
 		[19285] = { name = L["hex of weakness"], rank = 6, duration = 120 },
 
-		[589] = { name = L["shadow word: pain"], rank = 1, duration = 24 },  -- assume they have talent
-		[594] = { name = L["shadow word: pain"], rank = 2, duration = 24 },
-		[970] = { name = L["shadow word: pain"], rank = 3, duration = 24 },
-		[992] = { name = L["shadow word: pain"], rank = 4, duration = 24 },
-		[2767] = { name = L["shadow word: pain"], rank = 5, duration = 24 },
-		[10892] = { name = L["shadow word: pain"], rank = 6, duration = 24 },
-		[10893] = { name = L["shadow word: pain"], rank = 7, duration = 24 },
-		[10894] = { name = L["shadow word: pain"], rank = 8, duration = 24 },
+		[589] = { name = L["shadow word: pain"], rank = 1, duration = 24, variableDuration = true }, -- assume they have talent
+		[594] = { name = L["shadow word: pain"], rank = 2, duration = 24, variableDuration = true },
+		[970] = { name = L["shadow word: pain"], rank = 3, duration = 24, variableDuration = true },
+		[992] = { name = L["shadow word: pain"], rank = 4, duration = 24, variableDuration = true },
+		[2767] = { name = L["shadow word: pain"], rank = 5, duration = 24, variableDuration = true },
+		[10892] = { name = L["shadow word: pain"], rank = 6, duration = 24, variableDuration = true },
+		[10893] = { name = L["shadow word: pain"], rank = 7, duration = 24, variableDuration = true },
+		[10894] = { name = L["shadow word: pain"], rank = 8, duration = 24, variableDuration = true },
 
 		[15286] = { name = L["vampiric embrace"], rank = 1, duration = 60 },
 
diff --git a/ui.lua b/ui.lua
index 758c938..c388bd2 100644
--- a/ui.lua
+++ b/ui.lua
@@ -616,9 +616,7 @@ ui:SetScript("OnUpdate", function()
 			shouldDisplay = Cursive:ShouldDisplayGuid(guid)
 			shouldDisplayGuids[guid] = shouldDisplay
 
-			if not shouldDisplay then
-				CheckForCleanup(guid, time)
-			else
+			if shouldDisplay then
 				numDisplayable = numDisplayable + 1
 			end
 		else
@@ -644,6 +642,8 @@ ui:SetScript("OnUpdate", function()
 				thirdMaxHp = maxHp
 				thirdMaxGuid = guid
 			end
+		else
+			CheckForCleanup(guid, time)
 		end
 	end