fixing encryption/decryption again