attempt to fix baseurl issues