diff --git a/projects/clr/hipamd/src/hip_device.cpp b/projects/clr/hipamd/src/hip_device.cpp
index 8c72bd0d7c..1467bb2f40 100644
--- a/projects/clr/hipamd/src/hip_device.cpp
+++ b/projects/clr/hipamd/src/hip_device.cpp
@@ -302,8 +302,6 @@ hipError_t ihipGetDeviceProperties(hipDeviceProp_t* props, hipDevice_t device) {
   deviceProps.pciDeviceID = info.deviceTopology_.pcie.device;
   deviceProps.maxSharedMemoryPerMultiProcessor = info.localMemSizePerCU_;
   deviceProps.canMapHostMemory = 1;
-  // FIXME: This should be removed, targets can have character names as well.
-  deviceProps.gcnArch = isa.versionMajor() * 100 + isa.versionMinor() * 10 + isa.versionStepping();
   sprintf(deviceProps.gcnArchName, "%s", isa.targetId());
   deviceProps.cooperativeLaunch = info.cooperativeGroups_;
   deviceProps.cooperativeMultiDeviceLaunch = info.cooperativeMultiDeviceGroups_;
diff --git a/projects/clr/hipamd/src/hip_peer.cpp b/projects/clr/hipamd/src/hip_peer.cpp
index fb6b332942..240d1e0912 100644
--- a/projects/clr/hipamd/src/hip_peer.cpp
+++ b/projects/clr/hipamd/src/hip_peer.cpp
@@ -151,7 +151,8 @@ hipError_t hipDeviceGetP2PAttribute(int* value, hipDeviceP2PAttr attr,
       // Linear layout access is supported if P2P is enabled
       // Opaque Images are supported only on homogeneous systems
       // Might have more conditions to check, in future.
-      if (srcDeviceProp.gcnArch == dstDeviceProp.gcnArch) {
+      if (0 == strncmp(srcDeviceProp.gcnArchName, dstDeviceProp.gcnArchName,
+                      sizeof(srcDeviceProp.gcnArchName))) {
         HIP_RETURN_ONFAIL(canAccessPeer(value, srcDevice, dstDevice));
       } else {
         *value = 0;