fixed bug with token