I corrected this issue. Furthermore I think the heuristic is useful enough to ship it. At least it would have helped me writing the test cases for this PR. ;) When it works correct, I can't see any disadvantages on heaving it.