Improve bgpicker fallback