fixed token stuff