Fix for base url