Fix id duplication