Fix issue with keeping track of the heuristic.