moving DistanceCalc into static singletons of Helper class
fixed #295, Wrong next instruction found while traveling