diff --git a/Themes/Til Death/Scripts/Scores.lua b/Themes/Til Death/Scripts/Scores.lua
index e7916b8456..12ae37bae7 100644
--- a/Themes/Til Death/Scripts/Scores.lua	
+++ b/Themes/Til Death/Scripts/Scores.lua	
@@ -391,12 +391,12 @@ function getRescoredJudge(offsetVector, judgeScale, judge)
 	local tso = { 1.50, 1.33, 1.16, 1.00, 0.84, 0.66, 0.50, 0.33, 0.20 }
 	local ts = tso[judgeScale]
 	local windows = { 22.5, 45.0, 90.0, 135.0, 180.0, 500.0 }
-	windows[5] = math.max(windows[5], 180.0)
 	local lowerBound = judge > 1 and windows[judge - 1] * ts or -1.0
-	local upperBound = windows[judge] * ts
+	local upperBound = judge == 5 and math.max(windows[judge] * ts, 180.0) or windows[judge] * ts
 	local judgeCount = 0
 
 	if judge > 5 then
+		lowerBound = math.max(lowerBound, 180.0)
 		for i = 1, #offsetVector do
 			x = math.abs(offsetVector[i])
 			if (x > lowerBound) then