Fix issue with consistency of metadata output.