fix for potential loss of state change (nw)