Fixed to make change keyring to EnhancedEncryptedKeyring when it is
EncryptedKeyring