Fix header access