Optimized Code with Unique Id  conflict bug patch