diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 9caf1b7ae1..2f6cd0fc85 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -201,12 +201,11 @@ int NoteData::GetFirstRow() const
 
 float NoteData::GetFirstBeat() const		
 { 
-	float fEarliestBeatFoundSoFar = MAX_BEATS;
+	float fEarliestBeatFoundSoFar = -1;
 	
 	int i;
 
-	int rows = GetLastRow();
-	for( i=0; i<=rows; i++ )
+	for( i=0; i <= int(m_TapNotes[0].size()); i++ )
 	{
 		if( !IsRowEmpty(i) )
 		{
@@ -216,14 +215,16 @@ float NoteData::GetFirstBeat() const
 	}
 
 	for( i=0; i<GetNumHoldNotes(); i++ )
-		if( GetHoldNote(i).fStartBeat < fEarliestBeatFoundSoFar )
+	{
+		if( fEarliestBeatFoundSoFar == -1 ||
+			GetHoldNote(i).fStartBeat < fEarliestBeatFoundSoFar )
 			fEarliestBeatFoundSoFar = GetHoldNote(i).fStartBeat;
+	}
 
-
-	if( fEarliestBeatFoundSoFar == MAX_BEATS )	// there are no notes
+	if( fEarliestBeatFoundSoFar == -1 )	// there are no notes
 		return 0;
-	else
-		return fEarliestBeatFoundSoFar;
+
+	return fEarliestBeatFoundSoFar;
 }
 
 int NoteData::GetLastRow() const
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index 56ff60fbdc..1beff71b5a 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -140,7 +140,9 @@ float NoteDataWithScoring::GetActualVoltageRadarValue( float fSongSeconds )
 
 	const int BEAT_WINDOW = 8;
 
-	for( int i=0; i<MAX_BEATS; i+=BEAT_WINDOW )
+	const int fEndBeat = (int) GetMaxBeat()+1;
+
+	for( int i=0; i<fEndBeat; i+=BEAT_WINDOW )
 	{
 		int iNumNotesThisWindow = 0;
 		iNumNotesThisWindow += GetNumTapNotesWithScore(TNS_MARVELOUS,(float)i,(float)i+BEAT_WINDOW);