Fix group backtracking