Support newer version of lens.