heuristic fix
Furthest
Now working better!
Merge pull request #1 from marcandretr/post-fix

Post fix