bug fix with token