Fixed bug with overlapping ID