Added all entry fields before adding them, this should fix the bug where headers don't always appear.