Fixes #6439 by adding the lenght of the token now