Duplicate ID fix