Fixed baseUrl behaviour