Fix id / cid issue.