Attempting to resolve the baseurl issue