fix token handling, callback never was called