Fixed issue with DefaultDistanceStrategy