double check template diff header masking