fixed token storage