GroupController fix