Fixed table troubles