WIP: fixing dist-of coords