Fix Distance check