Fix BGpicker