Fixed case where base_url was empty