Fix table structure