Fixed bug where default heuristics could not be overridden.