Fix baseurl issue