bug fix and TargetMoveStrategy