Fix groups data