second attempt at fixing baseurl