diff --git a/configure.py b/configure.py
index 53e783db..0cebcd33 100644
--- a/configure.py
+++ b/configure.py
@@ -896,7 +896,7 @@ config.libs = [
             Object(Matching, "egg/gfx/eggPostEffectMask.cpp"),
             Object(NonMatching, "egg/gfx/eggPostEffectMaskDOF.cpp"),
             Object(Matching, "egg/gfx/eggPostEffectSimple.cpp"),
-            Object(NonMatching, "egg/gfx/eggScreen.cpp"),
+            Object(Matching, "egg/gfx/eggScreen.cpp"),
             Object(Matching, "egg/gfx/eggScreenEffectBase.cpp"),
             Object(NonMatching, "egg/gfx/eggScreenEffectBlur.cpp"),  # Unknown Guess
             Object(NonMatching, "egg/gfx/eggStateEfb.cpp"),
diff --git a/src/egg/gfx/eggScreen.cpp b/src/egg/gfx/eggScreen.cpp
index 18c41717..768c4b2c 100644
--- a/src/egg/gfx/eggScreen.cpp
+++ b/src/egg/gfx/eggScreen.cpp
@@ -287,8 +287,9 @@ void Screen::FillBufferGX(u32 flags, GXColor color, u32 r6) const {
 
         clone.SetProjectionGX();
         clone.CalcMatrixForDrawQuad(&drawMtx, 0.0f, 0.0f, mSize.x, mSize.y);
-        // Ugh
-        DrawGX::ClearEfb(drawMtx, (flags & 1), (flags & 2), (flags & 4), color, true);
+        DrawGX::ClearEfb(
+            drawMtx, (flags & 1) ? true : false, (flags & 2) ? true : false, (flags & 4) ? true : false, color, true
+        );
     }
 }