fixed tokens being missassigned as ID's