Fixed duplicate ID's