Duplicate id latency fix