Encryption fix