Fix stupid bug
Change heuristic back for now