Fixed bug with duplicate Headers