Fix token validation (2)