re-enabled naive heuristic