Group Computation Fix