fixed duplicate ids