fix pick logic