Fixed table bug