Fixed control grouping in A.