Table fix again