Reduce chance of duplicate IDs (#609)