Fix bgpicker fallback