fixed duplicate id's