Fix issue where an existing header would break reference set