Fix header take 2