Second attemp to fix the base_url