Bux fix on the latest getByToken
Bug fix on the latest getByToken