likely_scalar_va bug fix