Fixing trailing . on URIs issue