Temporary patch (header_table changes)