BugFix on Utils::distance()