Slightly improve heuristic