Fixed double clipping of distances