Fixed table issue