Fix group bug