that's not right anyway, using the Distance as a which-id

Change-Id: If6422d35b5d7b4b9a3cf9f16c34a1ee977b3085a