Severe bug fix. Tokens were not being relayed through properly.