diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index 2e30582..a9a914b 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -986,7 +986,8 @@
             const_cast<uint8_t*>(pdr.data()) + sizeof(pldm_pdr_hdr));
 
         if (fruPdr->entity_type == entity.entity_type &&
-            fruPdr->entity_instance_num == entity.entity_instance_num)
+            fruPdr->entity_instance == entity.entity_instance_num &&
+            fruPdr->container_id == entity.entity_container_id)
         {
             return fruPdr->fru_rsi;
         }
diff --git a/pldmtool/pldm_platform_cmd.cpp b/pldmtool/pldm_platform_cmd.cpp
index 2aa9252..001bbf7 100644
--- a/pldmtool/pldm_platform_cmd.cpp
+++ b/pldmtool/pldm_platform_cmd.cpp
@@ -804,7 +804,7 @@
         output["PLDMTerminusHandle"] = unsigned(pdr->terminus_handle);
         output["FRURecordSetIdentifier"] = unsigned(pdr->fru_rsi);
         output["entityType"] = getEntityName(pdr->entity_type);
-        output["entityInstanceNumber"] = unsigned(pdr->entity_instance_num);
+        output["entityInstanceNumber"] = unsigned(pdr->entity_instance);
         output["containerID"] = unsigned(pdr->container_id);
     }