Fix with distance collector