diff --git a/configure.py b/configure.py
index ee508b32a..8d3503d72 100644
--- a/configure.py
+++ b/configure.py
@@ -365,7 +365,7 @@ config.libs = [
             Object(Matching,    "f_pc/f_pc_layer_tag.cpp"),
             Object(Matching,    "f_pc/f_pc_line.cpp"),
             Object(Matching,    "f_pc/f_pc_load.cpp"),
-            Object(NonMatching, "f_pc/f_pc_manager.cpp"),
+            Object(Matching,    "f_pc/f_pc_manager.cpp"),
             Object(Matching,    "f_pc/f_pc_method.cpp"),
             Object(Matching,    "f_pc/f_pc_node.cpp"),
             Object(Matching,    "f_pc/f_pc_node_req.cpp"),
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index c44050b95..84ded4347 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -60,7 +60,6 @@ struct BMG_INF1 : JUTDataBlockHeader {
 
 /* 8003E3D0-8003E9F0       .text messageSet__FUl */
 void messageSet(u32 status) {
-    /* Nonmatching - regswap on msg[0] for USA and PAL (JPN already matches) */
 #if VERSION == VERSION_PAL
     BMG_INF1* inf1;
     if (dComIfGp_getPalLanguage() == 1) {
@@ -119,8 +118,8 @@ void messageSet(u32 status) {
         lineWidth[i] = 0.0f;
     }
 #endif
-    for (; msg[0] != '\0'; msg++) {
-        if (msg[0] == '\n') {
+    for (; *msg != '\0'; msg++) {
+        if (*msg == '\n') {
             height += 27;
 #if VERSION != VERSION_JPN
             curLine++;
@@ -129,7 +128,7 @@ void messageSet(u32 status) {
         }
 
 #if VERSION != VERSION_JPN
-        lineWidth[curLine] += font->JUTFont::getWidth(msg[0]);
+        lineWidth[curLine] += font->JUTFont::getWidth((u8)*msg);
 #endif
     }