diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java b/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java
index 8968a7129b20..a42a69c83d60 100644
--- a/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/memory/agent/MemoryAgentUtil.java
@@ -179,9 +179,9 @@ public final class MemoryAgentUtil {
   }
 
   public static boolean isPlatformSupported() {
-    return SystemInfo.isWindows && (CpuArch.CURRENT == CpuArch.X86_64 || CpuArch.CURRENT == CpuArch.X86) ||
-           SystemInfo.isMac && CpuArch.CURRENT == CpuArch.X86_64 ||
-           SystemInfo.isLinux && CpuArch.CURRENT == CpuArch.X86_64;
+    return SystemInfo.isWindows && (CpuArch.isIntel32() || CpuArch.isIntel64()) ||
+           SystemInfo.isMac && CpuArch.isIntel64() ||
+           SystemInfo.isLinux && CpuArch.isIntel64();
   }
 
   private static boolean isIbmJdk(@NotNull JavaParameters parameters) {
diff --git a/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java b/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
index dcdc121fe818..233030119e71 100644
--- a/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
+++ b/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
@@ -45,7 +45,7 @@ public final class IdeaWin32 {
   }
 
   private static boolean loadBundledLibrary() throws IOException {
-    String name = CpuArch.CURRENT == CpuArch.X86_64 ? "IdeaWin64" : "IdeaWin32";
+    String name = CpuArch.isIntel64() ? "IdeaWin64" : "IdeaWin32";
     URL bundled = IdeaWin32.class.getResource(name + ".dll");
     if (bundled == null) {
       return false;
diff --git a/platform/util/src/com/intellij/util/loader/NativeLibraryLoader.java b/platform/util/src/com/intellij/util/loader/NativeLibraryLoader.java
index 1db80de62f8f..9084a90c3ee0 100644
--- a/platform/util/src/com/intellij/util/loader/NativeLibraryLoader.java
+++ b/platform/util/src/com/intellij/util/loader/NativeLibraryLoader.java
@@ -12,7 +12,7 @@ import java.util.Arrays;
 public final class NativeLibraryLoader {
   public static void loadPlatformLibrary(@NotNull String libName) {
     String baseName = libName;
-    if (CpuArch.CURRENT == CpuArch.X86_64) {
+    if (CpuArch.isIntel64()) {
       baseName = baseName.replace("32", "") + "64";
     }