fix issue in Crypto and Codec