Fix tagged traffic