Added to nw companion bug — 2 years ago