diff --git a/configure.py b/configure.py
index b5ea1e700..0057bd920 100644
--- a/configure.py
+++ b/configure.py
@@ -544,7 +544,7 @@ config.libs = [
     JSystemLib(
         "JFramework",
         [
-            Object(NonMatching, "JSystem/JFramework/JFWDisplay.cpp"),
+            Object(Matching,    "JSystem/JFramework/JFWDisplay.cpp"),
             Object(NonMatching, "JSystem/JFramework/JFWSystem.cpp"),
         ],
     ),
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index 268ae0618..f63348acd 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/src/JSystem/JFramework/JFWDisplay.cpp
@@ -148,9 +148,9 @@ void JFWDisplay::exchangeXfb_double() {
             }
         }
 
-        const u32 idx = xfbMng->getDrawingXfbIndex();
+        s16 idx = xfbMng->getDrawingXfbIndex();
         xfbMng->setDrawnXfbIndex(idx);
-        xfbMng->setDrawingXfbIndex(((idx >> 31) - 1) & (idx ^ 1)); //not sure what this math is doing
+        xfbMng->setDrawingXfbIndex(idx >= 0 ? idx ^ 1 : 0);
     }
     else {
         clearEfb(mClearColor);