diff --git a/test/tool/tool.cpp b/test/tool/tool.cpp
index 16a9fbb5f7..5bd7412df6 100644
--- a/test/tool/tool.cpp
+++ b/test/tool/tool.cpp
@@ -49,6 +49,7 @@ THE SOFTWARE.
 #include <string>
 #include <thread>
 #include <vector>
+#include <algorithm>
 
 #include "inc/rocprofiler.h"
 #include "util/hsa_rsrc_factory.h"
@@ -1168,6 +1169,12 @@ extern "C" PUBLIC_API void OnLoadToolProp(rocprofiler_settings_t* settings)
   // Getting GPU indexes
   gpu_index_vec = new std::vector<uint32_t>;
   get_xml_array(xml, "top.metric", "gpu_index", ",", gpu_index_vec, "  ");
+  
+  // Skipping cpu count to get to correct gpu index
+  const uint32_t cpu_count = HsaRsrcFactory::Instance().GetCountOfCpuAgents();
+  std::transform(gpu_index_vec->begin(), gpu_index_vec->end(),
+                 gpu_index_vec->begin(),
+                 [&](int count) { return count + cpu_count; });
 
   // Getting kernel names
   kernel_string_vec = new std::vector<std::string>;