diff --git a/rocclr/runtime/device/gpu/gpuscsi.cpp b/rocclr/runtime/device/gpu/gpuscsi.cpp
index 5f5e548b84..5de3a41013 100644
--- a/rocclr/runtime/device/gpu/gpuscsi.cpp
+++ b/rocclr/runtime/device/gpu/gpuscsi.cpp
@@ -165,11 +165,13 @@ HSAILKernel::aqlCreateHWInfo(const void* shader, size_t shaderSize)
 
     char* headerBaseAddress =
         reinterpret_cast<char*>(siMetaData->common.hShaderMemHandle);
+    hsa_ext_code_descriptor_t* hcd =
+        reinterpret_cast<hsa_ext_code_descriptor_t*>(headerBaseAddress);
     amd_kernel_code_t* akc = reinterpret_cast<amd_kernel_code_t*>(
-        headerBaseAddress);
+        headerBaseAddress + hcd->code.handle);
 
     address codeStartAddress = reinterpret_cast<address>(akc);
-    address codeEndAddress = reinterpret_cast<address>(akc) + siMetaData->common.codeLenInByte;
+    address codeEndAddress = reinterpret_cast<address>(hcd) + siMetaData->common.codeLenInByte;
     codeSize_ = codeEndAddress - codeStartAddress;
     code_ = new gpu::Memory(dev(), amd::alignUp(codeSize_, gpu::ConstBuffer::VectorSize));
 
diff --git a/rocclr/runtime/utils/versions.hpp b/rocclr/runtime/utils/versions.hpp
index dec654c52f..5395169997 100644
--- a/rocclr/runtime/utils/versions.hpp
+++ b/rocclr/runtime/utils/versions.hpp
@@ -12,7 +12,7 @@
 #endif // AMD_PLATFORM_NAME
 
 #ifndef AMD_PLATFORM_BUILD_NUMBER
-# define AMD_PLATFORM_BUILD_NUMBER 1753
+# define AMD_PLATFORM_BUILD_NUMBER 1752
 #endif // AMD_PLATFORM_BUILD_NUMBER
 
 #ifndef AMD_PLATFORM_REVISION_NUMBER