Tokens fixed