fix encrypt/decrypt classes