Fix bgpicker