diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 6859886cd6..1a6a67f3cc 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -48,7 +48,7 @@ void Course::LoadFromCRSFile( CString sPath, vector<Song*> &apSongs )
 	if( !arrayPossibleBanners.empty() )
 		m_sBannerPath = arrayPossibleBanners[0];
 
-	for( unsigned i=0; i<msd.m_iNumValues; i++ )
+	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
 		CString sValueName = msd.m_sParams[i][0];
 		CString* sParams = msd.m_sParams[i];
diff --git a/stepmania/src/MsdFile.h b/stepmania/src/MsdFile.h
index dfb350434f..319440d1e5 100644
--- a/stepmania/src/MsdFile.h
+++ b/stepmania/src/MsdFile.h
@@ -21,6 +21,8 @@ class MsdFile
 	void AddParam( char *buf, int len );
 	void AddValue();
 
+	unsigned m_iNumValues;	// tells how many values are valid
+
 public:
 	MsdFile();
 
@@ -33,8 +35,10 @@ public:
 
 	CString m_sParams[MAX_VALUES][MAX_PARAMS_PER_VALUE];
 
-	unsigned m_iNumValues;	// tells how many values are valid
+	/* #param:param:param:param; <- one whole value */
 	unsigned m_iNumParams[MAX_VALUES];	// tells how many params this value has
+
+	unsigned GetNumValues() const { return m_iNumValues; }
 };
 
 #endif
diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index cb122b09ea..86f9fac296 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -273,7 +273,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
 	if( !bResult )
 		RageException::Throw( "Error opening file '%s' for reading.", sPath.GetString() );
 
-	for( unsigned i=0; i<msd.m_iNumValues; i++ )
+	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
 		int iNumParams = msd.m_iNumParams[i];
 		CString* sParams = msd.m_sParams[i];
diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp
index ad357aa08b..4a389f353a 100644
--- a/stepmania/src/NotesLoaderKSF.cpp
+++ b/stepmania/src/NotesLoaderKSF.cpp
@@ -21,7 +21,7 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Notes &out )
 	int iTickCount = -1;	// this is the value we read for TICKCOUNT
 	CString iStep;			// this is the value we read for STEP
 
-	for( unsigned i=0; i<msd.m_iNumValues; i++ )
+	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
 		CString* sParams = msd.m_sParams[i];
 		CString sValueName = sParams[0];
@@ -190,7 +190,7 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
 	if( !bResult )
 		RageException::Throw( "Error opening file '%s'.", sPath.GetString() );
 
-	for( i=0; i < msd.m_iNumValues; i++ )
+	for( i=0; i < msd.GetNumValues(); i++ )
 	{
 		CString* sParams = msd.m_sParams[i];
 		CString sValueName = sParams[0];
diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index bec7e3abf0..2efdc5b6e9 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -59,7 +59,7 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out )
 	if( !bResult )
 		RageException::Throw( "Error opening file '%s'.", sPath.GetString() );
 
-	for( unsigned i=0; i<msd.m_iNumValues; i++ )
+	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
 		int iNumParams = msd.m_iNumParams[i];
 		CString* sParams = msd.m_sParams[i];