Temporary fix for massive distance problem