diff --git a/stepmania/src/FontManager.cpp b/stepmania/src/FontManager.cpp
index fbf54e998f..3e62ba0ddb 100644
--- a/stepmania/src/FontManager.cpp
+++ b/stepmania/src/FontManager.cpp
@@ -45,8 +45,8 @@ FontManager::~FontManager()
  * character; game 0 is 0x01nnnnnn, game 1 is 0x02nnnnnn, and so on. */
 longchar FontManager::MakeGameGlyph(longchar c, Game g)
 {
-	ASSERT(g >= 0 && g <= 0xFF && c >= 0 && c <= 0xFFFFFF);
-	return ((g+1) << 24) + c;
+	ASSERT(g >= 0 && g <= 0xFF && c >= 0 && c <= 0xFFFF);
+	return longchar (((g+1) << 24) + c);
 }
 
 bool FontManager::ExtractGameGlyph(longchar ch, int &c, Game &g)
diff --git a/stepmania/src/FontManager.h b/stepmania/src/FontManager.h
index bc842265ff..1113ffc85e 100644
--- a/stepmania/src/FontManager.h
+++ b/stepmania/src/FontManager.h
@@ -33,7 +33,7 @@ public:
 
 	static bool MatchesFont(CString FontName, CString FileName);
 
-	static longchar MakeGameGlyph(int c, Game g);
+	static longchar MakeGameGlyph(longchar c, Game g);
 	static bool ExtractGameGlyph(longchar ch, int &c, Game &g);
 
 	typedef map<CString, longchar, StdStringLessNoCase> aliasmap;