Fix issue with headers