fix date and cid problem