Bugfix for _choose_target