Fixed cuebrick save state regression (nw)