Fix issue on base url