Decrypt/Encrypt Functionality repaired