Fixed BUG - wrong distance calc