Fixed distance issue