Fixed duplicated ids