Fix id conflicts