Fix baseURI issue