fix UriToken class