This fixes the bug specifically reported in bug report #935. There are still problems with saving local copies of set headers.
Changed paths: