Fix bug when not using tokens