diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua
index 9fbb1a7100..40c6887cf4 100644
--- a/Themes/default/Graphics/Player judgment/default.lua	
+++ b/Themes/default/Graphics/Player judgment/default.lua	
@@ -47,14 +47,13 @@ t[#t+1] = Def.ActorFrame {
 	end;
 
 	JudgmentMessageCommand=function(self, param)
+		local t
 		if param.Player ~= player then return end;
 		if param.HoldNoteScore then return end;
-
+		
 		local iNumStates = c.Judgment:GetNumStates();
 		local iFrame = TNSFrames[param.TapNoteScore];
 		
-		local iTapNoteOffset = param.TapNoteOffset;
-		
 		if not iFrame then return end
 		if iNumStates == 12 then
 			iFrame = iFrame * 2;
@@ -63,6 +62,13 @@ t[#t+1] = Def.ActorFrame {
 			end
 		end
 		
+		local iTapNoteOffset = param.TapNoteOffset;
+		if param.HoldNoteScore then
+			iTapNoteOffset = 1;
+		else
+			iTapNoteOffset = param.TapNoteOFfset; 
+		end
+		
 		self:playcommand("Reset");
 
 		c.Judgment:visible( not bShowProtiming );
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 150cb392e2..1a9db6e328 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -305,12 +305,12 @@ RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2)
 [Protiming]
 ProtimingOnCommand=shadowlength,1;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner";
 
-ProtimingW1Command=diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_W1"];linear,0.05;zoom,1;glow,Color("Invisible");sleep,2;linear,0.5;diffuse,Color("Invisible");
-ProtimingW2Command=diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_W2"];linear,0.05;zoom,1;glow,Color("Invisible");sleep,2;linear,0.5;diffuse,Color("Invisible");
-ProtimingW3Command=diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_W3"];linear,0.05;zoom,1;glow,Color("Invisible");sleep,2;linear,0.5;diffuse,Color("Invisible");
-ProtimingW4Command=diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_W4"];linear,0.05;zoom,1;glow,Color("Invisible");sleep,2;linear,0.5;diffuse,Color("Invisible");
-ProtimingW5Command=diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_W5"];
-ProtimingMissCommand=diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_Miss"];linear,0.05;zoom,1;glow,Color("Invisible");sleep,2;linear,0.5;diffuse,Color("Invisible");
+ProtimingW1Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W1"];sleep,2;linear,0.5;diffuse,Color("Invisible");
+ProtimingW2Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W2"];sleep,2;linear,0.5;diffuse,Color("Invisible");
+ProtimingW3Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W3"];sleep,2;linear,0.5;diffuse,Color("Invisible");
+ProtimingW4Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W4"];sleep,2;linear,0.5;diffuse,Color("Invisible");
+ProtimingW5Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W5"];sleep,2;linear,0.5;diffuse,Color("Invisible");
+ProtimingMissCommand=finishtweening;diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_Miss"];linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_Miss"];sleep,2;linear,0.5;diffuse,Color("Invisible");
 
 [Player]
 ReceptorArrowsYStandard=GetTapPosition('Standard')