Add a had_v2 marker to keep track