Fixed table labels again