Fixed metadata parsing