diff --git a/internal/data/node.go b/internal/data/node.go
index abcb75d11..bd6e5cb0f 100644
--- a/internal/data/node.go
+++ b/internal/data/node.go
@@ -468,8 +468,8 @@ func OSAttrsToGenericAttributes(attributeType reflect.Type, attributeValuePtr *r
 	attrs = make(map[GenericAttributeType]json.RawMessage)
 
 	// Iterate over the fields of the struct
-	for i := 0; i < attributeType.NumField(); i++ {
-		field := attributeType.Field(i)
+	for field := range attributeType.Fields() {
+		field := field
 
 		// Get the field value using reflection
 		fieldValue := attributeValue.FieldByName(field.Name)