diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
index 4e032d288..f6623fa5e 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
@@ -546,10 +546,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID));
 
         Task.supplyAsync(JavaVersion::getJavas).thenAcceptAsync(Schedulers.javafx(), list -> {
-            boolean isX86 = (Architecture.SYSTEM_ARCH.isX86())
-                    && list.stream().allMatch(java -> java.getArchitecture().isX86());
-
-            // boolean showSystem = list.stream().anyMatch(java -> java.getPlatform().getOperatingSystem() != OperatingSystem.CURRENT_OS);
+            boolean isX86 = Architecture.SYSTEM_ARCH.isX86() && list.stream().allMatch(java -> java.getArchitecture().isX86());
 
             List<MultiFileItem.Option<JavaVersion>> options = list.stream()
                     .map(javaVersion -> new MultiFileItem.Option<>(
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
index 07c303c12..060754139 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
@@ -105,8 +105,8 @@ public enum JavaVersionConstraint {
         public boolean appliesToVersion(@Nullable VersionNumber gameVersionNumber, @Nullable Version version,
                                         @Nullable JavaVersion javaVersion) {
             return getGameVersionRange().contains(gameVersionNumber)
-                    && Architecture.SYSTEM_ARCH != Architecture.X86 && Architecture.SYSTEM_ARCH != Architecture.X86_64
-                    && (javaVersion != null && (javaVersion.getArchitecture() != Architecture.X86 && javaVersion.getArchitecture() != Architecture.X86_64));
+                    && javaVersion != null
+                    && !javaVersion.getArchitecture().isX86();
         }
 
         @Override
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
index efe00d4a8..ad4ab821f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
@@ -97,7 +97,6 @@ public final class JavaVersion {
     private static final Pattern REGEX = Pattern.compile("version \"(?<version>(.*?))\"");
     private static final Pattern VERSION = Pattern.compile("^(?<version>[0-9]+)");
 
-    private static final Pattern OS_NAME = Pattern.compile("os\\.name = (?<name>.*)");
     private static final Pattern OS_ARCH = Pattern.compile("os\\.arch = (?<arch>.*)");
     private static final Pattern JAVA_VERSION = Pattern.compile("java\\.version = (?<version>.*)");
 
@@ -132,7 +131,6 @@ public final class JavaVersion {
         if (cachedJavaVersion != null)
             return cachedJavaVersion;
 
-        String osName = null;
         String osArch = null;
         String version = null;
 
@@ -143,20 +141,10 @@ public final class JavaVersion {
             for (String line; (line = reader.readLine()) != null; ) {
                 Matcher m;
 
-                m = OS_NAME.matcher(line);
-                if (m.find()) {
-                    osName = m.group("name");
-                    if (osArch != null && version != null) {
-                        break;
-                    } else {
-                        continue;
-                    }
-                }
-
                 m = OS_ARCH.matcher(line);
                 if (m.find()) {
                     osArch = m.group("arch");
-                    if (osName != null && version != null) {
+                    if (version != null) {
                         break;
                     } else {
                         continue;
@@ -166,7 +154,7 @@ public final class JavaVersion {
                 m = JAVA_VERSION.matcher(line);
                 if (m.find()) {
                     version = m.group("version");
-                    if (osName != null && osArch != null) {
+                    if (osArch != null) {
                         break;
                     } else {
                         //noinspection UnnecessaryContinue
@@ -176,8 +164,8 @@ public final class JavaVersion {
             }
         }
 
-        if (osName != null && osArch != null) {
-            platform = Platform.getPlatform(OperatingSystem.parseOSName(osName), Architecture.parseArchName(osArch));
+        if (osArch != null) {
+            platform = Platform.getPlatform(OperatingSystem.CURRENT_OS, Architecture.parseArchName(osArch));
         }
 
         if (version == null) {