Fix for base_url