Fixed metadata assigning