Use new mask with zeros instead of nans