fixed problem with finding token