Fixes issue where rax role masking was not taking header state into account