Dup original headers before modifying (fixes #81 and #85)