fix remaining device (nw)