diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index c4f95923d3..4362cbaf04 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -227,7 +227,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
 			CString sKeyName = pAttr->m_sName; /* "OnCommand" */
 
 			CString sValue = pAttr->m_sValue;
-			THEME->EvaluateString( sValue );
 			apActorCommands apac( new ActorCommands( sValue ) );
 
 			CString sCmdName = sKeyName.Left( sKeyName.size()-7 );
@@ -251,7 +250,6 @@ void Actor::LoadFromNode( const CString& sDir, const XNode* pNode )
 		c->GetAttrValue( "Value", sValue );
 
 		THEME->EvaluateString( sName );
-		THEME->EvaluateString( sValue );
 		apActorCommands apac( new ActorCommands( sValue ) );
 
 		AddCommand( sName, apac );
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 467b07a2f9..a4c61ad646 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -721,7 +721,7 @@ Commands ThemeManager::GetMetricM( const CString &sClassName, const CString &sVa
 
 apActorCommands ThemeManager::GetMetricA( const CString &sClassName, const CString &sValueName )
 {
-	CString sValue = GetMetric( sClassName, sValueName );	// Use non-raw so that Lua expressions are allowed
+	CString sValue = GetMetricRaw( sClassName, sValueName );
 	return apActorCommands( new ActorCommands( sValue ) );
 }