Final table fix - makes me happy!