Try to fix baseurl bug