fix token table creation