Fix heuristics bug, again