Fix problem with table and data