Fixing NaNwq