fixing group name mess I
fixing group name mess II