Fixe handling of URIs