rs_en/decoder header class fix