Fix issue with route recalculation
Fix issue with route recalculation