cwu_cid#: fix 10403#