Reduce header copy to fix #5