Fix bg-picker