As said in the last PR, please stick with the TargetSelector and don't miss the findNextTarget-fix