TargetSelector fix