diff --git a/src/pdr.c b/src/pdr.c
index a60e229..6c321ad 100644
--- a/src/pdr.c
+++ b/src/pdr.c
@@ -1318,15 +1318,12 @@
 	(*entities)->entity_container_id =
 		le16toh(entity_association_pdr->container.entity_container_id);
 	pldm_entity *curr_entity = entity_association_pdr->children;
-	size_t i = 1;
-	while (i < *num_entities) {
+	for (size_t i = 1; i < *num_entities; i++, curr_entity++) {
 		(*entities + i)->entity_type =
 			le16toh(curr_entity->entity_type);
 		(*entities + i)->entity_instance_num =
 			le16toh(curr_entity->entity_instance_num);
 		(*entities + i)->entity_container_id =
 			le16toh(curr_entity->entity_container_id);
-		++curr_entity;
-		++i;
 	}
 }