Fix header implementation