Really fix that ID conflict.