Really fix metadata order