diff --git a/Themes/_fallback/Scripts/04 Scoring.lua b/Themes/_fallback/Scripts/04 Scoring.lua
index 1c8c8df8b5..120177cd4d 100644
--- a/Themes/_fallback/Scripts/04 Scoring.lua	
+++ b/Themes/_fallback/Scripts/04 Scoring.lua	
@@ -89,11 +89,14 @@ r['DDR Extreme'] = function(params, pss)
 	local totalItems = GetTotalItems(radarValues);
 	local singleStep = (1 + totalItems) * totalItems / 2;
 	if (not Shared.CurrentStep) then
-		Shared.CurrentStep = 0
+		Shared.CurrentStep = {};
+		Shared.CurrentStep["P1"] = 0;
+		Shared.CurrentStep["P2"] = 0;
 	end;
-	Shared.CurrentStep = Shared.CurrentStep + 1;
+	local pn = PlayerNumberToString(params.Player);
+	Shared.CurrentStep[pn] = Shared.CurrentStep[pn] + 1;
 	local stepValue = math.floor(baseScore /singleStep);
-	local stepLast = stepValue * Shared.CurrentStep;
+	local stepLast = stepValue * Shared.CurrentStep[pn];
 	pss:SetCurMaxScore(pss:GetCurMaxScore() + 
 		(stepLast * judgmentBase['TapNoteScore_W1']));
 	local judgeScore = 0;
@@ -107,9 +110,9 @@ r['DDR Extreme'] = function(params, pss)
 	end;
 	local stepScore = judgeScore * stepLast;
 	pss:SetScore(pss:GetScore() + stepScore);
-	if (Shared.CurrentStep >= totalItems) then -- Just in case.
+	if (Shared.CurrentStep[pn] >= totalItems) then -- Just in case.
 		-- TODO: Implement the bonus for the last step?
-		Shared.CurrentStep = 0; -- Reset for the next song.
+		Shared.CurrentStep[pn] = 0; -- Reset for the next song.
 	end;
 end;
 -----------------------------------------------------------