Fix distance / orientation measurement