Tactical avoidance fix