diff --git a/src/Player.cpp b/src/Player.cpp
index 75da9f0ca0..d8e4ae0bfd 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -1206,33 +1206,28 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 	bool bIsHoldingButton = true;
 	FOREACH( TrackRowTapNote, vTN, trtn )
 	{
-		/*if this hold is already done, pretend it's always being pressed.
-		fixes/masks the phantom hold issue. -FSX*/
-		if( (iStartRow + trtn->pTN->iDuration) > iSongRow )
+		int iTrack = trtn->iTrack;
+
+		// TODO: Remove use of PlayerNumber.
+		PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
+
+		if( m_pPlayerState->m_PlayerController != PC_HUMAN )
 		{
-			int iTrack = trtn->iTrack;
-
-			// TODO: Remove use of PlayerNumber.
-			PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
-			if( m_pPlayerState->m_PlayerController != PC_HUMAN )
+		// TODO: Make the CPU miss sometimes.
+			if( m_pPlayerState->m_PlayerController == PC_AUTOPLAY )
 			{
-			// TODO: Make the CPU miss sometimes.
-				if( m_pPlayerState->m_PlayerController == PC_AUTOPLAY )
-				{
-					STATSMAN->m_CurStageStats.m_bUsedAutoplay = true;
-					if( m_pPlayerStageStats != NULL )
-						m_pPlayerStageStats->m_bDisqualified = true;
-				}
-			}
-			else
-			{
-				GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( iTrack, pn );
-			// this previously read as bIsHoldingButton &=
-			// was there a specific reason for this? - Friez
-				bIsHoldingButton &= INPUTMAPPER->IsBeingPressed( GameI, m_pPlayerState->m_mp );
+				STATSMAN->m_CurStageStats.m_bUsedAutoplay = true;
+				if( m_pPlayerStageStats != NULL )
+					m_pPlayerStageStats->m_bDisqualified = true;
 			}
 		}
+		else
+		{
+			GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( iTrack, pn );
+		// this previously read as bIsHoldingButton &=
+		// was there a specific reason for this? - Friez
+			bIsHoldingButton &= INPUTMAPPER->IsBeingPressed( GameI, m_pPlayerState->m_mp );
+		}
 	}
 
 	if( bInitiatedNote && fLife != 0 && bHeadJudged )
@@ -1263,11 +1258,11 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 				TapNote &tn = *trtn->pTN;
 
 				// set hold flag so NoteField can do intelligent drawing
-				tn.HoldResult.bHeld = bIsHoldingButton && bInitiatedNote;
+				tn.HoldResult.bHeld = bIsHoldingButton && bInitiatedNote ||;
 				tn.HoldResult.bActive = bInitiatedNote;
 			}
 
-			if( bInitiatedNote && bIsHoldingButton )
+			if( bInitiatedNote && bIsHoldingButton || ((iStartRow + trtn->pTN->iDuration) > iSongRow ) )
 			{
 				//LOG->Trace("bInitiatedNote && bIsHoldingButton; Increasing hold life to MAX_HOLD_LIFE");
 				// Increase life