Trying to fix baseurl issue