Fix bug with baseUrl