Fixing baseurl issue