Fixing duplicate IDs