Tokens fix