Fix ID collision