Move AVC to proper constant group