Fix in EncryptionTool