diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index e76a7bc46c..b2598ebdca 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -606,13 +606,13 @@ void ScreenEz2SelectMusic::MusicChanged()
 	m_CurrentSubTitle.SetText( pSong->m_sSubTitle, "");
 	m_CurrentArtist.SetText( pSong->m_sArtist, "");
 
-	if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds )
+	if( pSong->IsMarathon() )
 	{
 		m_sprBalloon.StopTweening();
 		m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon marathon") );
 		SET_XY_AND_ON_COMMAND( m_sprBalloon );
 	}
-	else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds )
+	else if( pSong->IsLong() )
 	{
 		m_sprBalloon.StopTweening();
 		m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon long") );
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 916d9ab277..d11cd5c24c 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -649,9 +649,9 @@ RString SongManager::ShortenGroupName( RString sLongGroupName )
 int SongManager::GetNumStagesForSong( const Song* pSong )
 {
 	ASSERT( pSong );
-	if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds )
+	if( pSong->IsMarathon() )
 		return 3;
-	if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds )
+	if( pSong->IsLong() )
 		return 2;
 	else
 		return 1;