diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index 32b396a25d..56ff60fbdc 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -30,10 +30,13 @@ void NoteDataWithScoring::Init()
 	m_fHoldNoteLife.clear();
 }
 
-int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, const float fEndBeat )
+int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat )
 { 
 	int iNumSuccessfulTapNotes = 0;
 
+	if(fEndBeat == -1)
+		fEndBeat = GetMaxBeat()+1;
+
 	unsigned iStartIndex = BeatToNoteRow( fStartBeat );
 	unsigned iEndIndex = BeatToNoteRow( fEndBeat );
 
@@ -49,10 +52,13 @@ int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float
 	return iNumSuccessfulTapNotes;
 }
 
-int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat, const float fEndBeat )			
+int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat )
 {
 	int iNumSuccessfulDoubles = 0;
 
+	if(fEndBeat == -1)
+		fEndBeat = GetMaxBeat()+1;
+
 	unsigned iStartIndex = BeatToNoteRow( fStartBeat );
 	unsigned iEndIndex = BeatToNoteRow( fEndBeat );
 
@@ -75,10 +81,13 @@ int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float f
 	return iNumSuccessfulDoubles;
 }
 
-int NoteDataWithScoring::GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat, const float fEndBeat )			
+int NoteDataWithScoring::GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat, float fEndBeat )
 {
 	int iNumSuccessfulHolds = 0;
 
+	if(fEndBeat == -1)
+		fEndBeat = GetMaxBeat()+1;
+
 	for( int i=0; i<GetNumHoldNotes(); i++ )
 	{
 		const HoldNote &hn = GetHoldNote(i);
diff --git a/stepmania/src/NoteDataWithScoring.h b/stepmania/src/NoteDataWithScoring.h
index 81b7863ff6..2bd8a546ef 100644
--- a/stepmania/src/NoteDataWithScoring.h
+++ b/stepmania/src/NoteDataWithScoring.h
@@ -31,9 +31,9 @@ public:
 	void Init();
 
 	// statistics
-	int GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = MAX_BEATS );
-	int GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = MAX_BEATS );
-	int GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat = 0, const float fEndBeat = MAX_BEATS );
+	int GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 );
+	int GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 );
+	int GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat = 0, const float fEndBeat = -1 );
 
 	TapNoteScore GetTapNoteScore(unsigned track, unsigned row) const;
 	void SetTapNoteScore(unsigned track, unsigned row, TapNoteScore tns);