Fixed table again