Token processing fixed