Andy's fix on Dijkstra algorithm !