diff --git a/stepmania/src/CryptManager.cpp b/stepmania/src/CryptManager.cpp
index de589817be..e951cd5e56 100644
--- a/stepmania/src/CryptManager.cpp
+++ b/stepmania/src/CryptManager.cpp
@@ -421,7 +421,7 @@ RString CryptManager::GetMD5ForFile( RString fn )
 	unsigned char digest[16];
 	HashFile( file, digest, iHash );
 
-	return BinaryToHex( digest, sizeof(digest) );
+	return RString( (const char *) digest, sizeof(digest) );
 }
 
 RString CryptManager::GetMD5ForString( RString sData )
@@ -435,7 +435,7 @@ RString CryptManager::GetMD5ForString( RString sData )
 	iRet = hash_descriptor[iHash].process( &hash, (const unsigned char *) sData.data(), sData.size() );
 	iRet = hash_descriptor[iHash].done( &hash, digest );
 
-	return BinaryToHex( digest, sizeof(digest) );
+	return RString( (const char *) digest, sizeof(digest) );
 }
 
 RString CryptManager::GetPublicKeyFileName()
diff --git a/stepmania/src/CryptManager.h b/stepmania/src/CryptManager.h
index e90699c77a..b02742e2d2 100644
--- a/stepmania/src/CryptManager.h
+++ b/stepmania/src/CryptManager.h
@@ -20,8 +20,8 @@ public:
 
 	static void GetRandomBytes( void *pData, int iBytes );
 
-	static RString GetMD5ForFile( RString fn );	// in Hex
-	static RString GetMD5ForString( RString sData );	// in Hex
+	static RString GetMD5ForFile( RString fn );	// binary
+	static RString GetMD5ForString( RString sData );	// in binary
 
 	static RString GetPublicKeyFileName();
 };
diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 3294c88eb6..40026a7ce8 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -830,7 +830,7 @@ RString NetworkSyncManager::MD5Hex( const RString &sInput )
 	RString HashedName;
 	RString PreHashedName;
 
-	RString sOutput = CryptManager::GetMD5ForString( sInput );
+	RString sOutput = BinaryToHex( CryptManager::GetMD5ForString(sInput) );
 
 	for (int i = 0; i < 16; i++)
 		PreHashedName += ssprintf( "%2X", sOutput[i] );
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index e1b34e40dd..45e0a77d89 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -761,7 +761,7 @@ void ScreenEvaluation::Input( const InputEventPlus &input )
 					const HighScore &hs = STATSMAN->m_CurStageStats.m_player[pn].m_HighScore;
 					Screenshot screenshot;
 					screenshot.sFileName = sFileName;
-					screenshot.sMD5 = CRYPTMAN->GetMD5ForFile( sPath );
+					screenshot.sMD5 = BinaryToHex( CRYPTMAN->GetMD5ForFile(sPath) );
 					screenshot.highScore = hs;
 					pProfile->AddScreenshot( screenshot );
 				}