Fixed duplicate Id's