Fix bug when token v2 is validated