fixed empty cid issue