Fix bug where sometimes the ECI is a "token" and other times its a "cid"