without token loading bug fix