Fixed table again, this time values, not format