Fix the conflicting ID issue.