Bugfix for headers parsing