Another bug removed - Encryption is okay now