Fixed issue with same lat/long and diff id