Getting baseUrl fixed