Fixed bug with baseUrl reference