First fix of Crypto import