Fixed token handling.