diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index 055cc59cd..82ca8f1e9 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -1333,19 +1333,9 @@ std::string Emulator::FindLaunchModule() {
 }
 
 static std::string format_version(xex2_version version) {
-  // fmt::format doesn't like bit fields
-  uint32_t major, minor, build, qfe;
-  major = version.major;
-  minor = version.minor;
-  build = version.build;
-  qfe = version.qfe;
-  if (qfe) {
-    return fmt::format("{}.{}.{}.{}", major, minor, build, qfe);
-  }
-  if (build) {
-    return fmt::format("{}.{}.{}", major, minor, build);
-  }
-  return fmt::format("{}.{}", major, minor);
+  // fmt::format doesn't like bit fields we use + to bypass it
+  return fmt::format("{}.{}.{}.{}", +version.major, +version.minor,
+                     +version.build, +version.qfe);
 }
 
 X_STATUS Emulator::CompleteLaunch(const std::filesystem::path& path,
diff --git a/src/xenia/kernel/util/xex2_info.h b/src/xenia/kernel/util/xex2_info.h
index d9e939478..52df96ad4 100644
--- a/src/xenia/kernel/util/xex2_info.h
+++ b/src/xenia/kernel/util/xex2_info.h
@@ -375,10 +375,10 @@ struct xex2_opt_file_format_info {
 union xex2_version {
   uint32_t value;
   struct {
-    uint32_t major : 4;
-    uint32_t minor : 4;
-    uint32_t build : 16;
     uint32_t qfe : 8;
+    uint32_t build : 16;
+    uint32_t minor : 4;
+    uint32_t major : 4;
   };
 };