Changed distance method, should fix get * problems