Fix the cid creation.