Correct analyze for new token format