Trying to fix the metadata