Use nan_mask regardless of regridding