Encryption Fix