Avoid mode re-enumeration, take two.