Improved decryption