Fix group order