Token validation fixed