Improve distance limit