Fix on TargetManager