fix target selection issue (part 2)