diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 186f0c8949..ad5a1a12c4 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -677,7 +677,7 @@ void Song::TidyUpData()
 	unsigned i;
 	for( i=0; i<arrayImages.size(); i++ )	// foreach image
 	{
-		if( m_sBannerFile != "" && m_sCDTitleFile != "" && m_sBackgroundFile != "" )
+		if( HasBanner() && HasCDTitle() && HasBackground() )
 			break; /* done */
 
 		// ignore DWI "-char" graphics