Trying to fix metadata still