diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 8c009663ff..213210caab 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -11,8 +11,8 @@
 #include "GameManager.h"
 
 
-#define SECONDS_TO_SHOW			THEME->GetMetricF("ScreenDemonstration","SecondsToShow")
-#define NEXT_SCREEN				THEME->GetMetric("ScreenDemonstration","NextScreen")
+#define SECONDS_TO_SHOW			THEME->GetMetricF(m_sName,"SecondsToShow")
+#define NEXT_SCREEN				THEME->GetMetric (m_sName,"NextScreen")
 
 REGISTER_SCREEN_CLASS( ScreenDemonstration );
 ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName )
diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index a0df6cd612..81ea97f778 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -21,12 +21,12 @@
 #include "CommonMetrics.h"
 
 #define SHOW_COURSE_MODIFIERS_PROBABILITY	THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")
-static ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW_HERE("ScreenDemonstration","DifficultiesToShow");
 
 REGISTER_SCREEN_CLASS( ScreenJukebox );
 void ScreenJukebox::SetSong()
 {
 	ThemeMetric<float>	ALLOW_ADVANCED_MODIFIERS(m_sName,"AllowAdvancedModifiers");
+	ThemeMetricDifficultiesToShow	DIFFICULTIES_TO_SHOW_HERE(m_sName,"DifficultiesToShow");
 
 	vector<Song*> vSongs;