Fix the tables grrrr