And, actually, even better is to loop through each header and add, which is what current master does.