Temp workaround for fixing the baseURL issue.