Fix issue with base url