Fix duplicate ID