Bugfix for headers