diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index d51780723b..6e02ba4f18 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -333,7 +333,7 @@ void ScoreKeeperMAX2::HandleTapScore( TapNoteScore score )
 {
 	if( score == TNS_HIT_MINE )
 	{
-		if( m_pPlayerState->m_HealthState != PlayerState::DEAD )
+		if( !m_pPlayerStageStats->bFailed )
 			m_pPlayerStageStats->iActualDancePoints += TapNoteScoreToDancePoints( TNS_HIT_MINE );
 		m_pPlayerStageStats->iTapNoteScores[TNS_HIT_MINE] += 1;
 	}
@@ -344,8 +344,9 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
 	ASSERT( iNumTapsInRow >= 1 );
 
 	// Update dance points.
-	if( m_pPlayerState->m_HealthState != PlayerState::DEAD )
+	if( !m_pPlayerStageStats->bFailed )
 		m_pPlayerStageStats->iActualDancePoints += TapNoteScoreToDancePoints( scoreOfLastTap );
+	m_pPlayerStageStats->iCurPossibleDancePoints += TapNoteScoreToDancePoints( TNS_MARVELOUS );
 	// update judged row totals
 	m_pPlayerStageStats->iTapNoteScores[scoreOfLastTap] += 1;
 
@@ -433,8 +434,9 @@ void ScoreKeeperMAX2::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTa
 void ScoreKeeperMAX2::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore )
 {
 	// update dance points totals
-	if( m_pPlayerState->m_HealthState != PlayerState::DEAD )
+	if( !m_pPlayerStageStats->bFailed )
 		m_pPlayerStageStats->iActualDancePoints += HoldNoteScoreToDancePoints( holdScore );
+	m_pPlayerStageStats->iCurPossibleDancePoints += HoldNoteScoreToDancePoints( HNS_OK );
 	m_pPlayerStageStats->iHoldNoteScores[holdScore] ++;
 
 	// increment the current total possible dance score