Fix ID reassignment