Fix token creation.