Fix trailing slash baseurl issue