fixed cid rehydration issue