Fix header lookup