fixing group stuff