fixed error with token changing