fix location bug.
Merge branch 'fix/distance' into develop