Fix same group bug