Correct error introduced in Token to deal with (not really) duplicated code