diff --git a/trezor_agent/gpg/encode.py b/trezor_agent/gpg/encode.py
index b0c2a04..538c868 100644
--- a/trezor_agent/gpg/encode.py
+++ b/trezor_agent/gpg/encode.py
@@ -188,7 +188,8 @@ class Signer(object):
             verifying_key=self.conn.pubkey())
 
         log.info('%s GPG public key %s created at %s', curve_name,
-                 self.pubkey.hex_short_key_id(), util.time_format(self.pubkey.created))
+                 self.pubkey.hex_short_key_id(),
+                 util.time_format(self.pubkey.created))
 
     @classmethod
     def from_public_key(cls, pubkey, user_id):
@@ -261,16 +262,14 @@ class Signer(object):
             subpacket(16, primary['key_id']),  # issuer key id
             subpacket(32, back_sign)]
 
-        _conn = self.conn
-        self.conn = AgentSigner(user_id, curve_name=formats.CURVE_NIST256)
+        conn = AgentSigner(user_id, curve_name=formats.CURVE_NIST256)
 
         # Subkey Binding Signature
-        signature = _make_signature(pubkey=self.pubkey, conn=self.conn,
+        signature = _make_signature(pubkey=self.pubkey, conn=conn,
                                     data_to_sign=data_to_sign,
                                     sig_type=0x18,
                                     hashed_subpackets=hashed_subpackets,
                                     unhashed_subpackets=unhashed_subpackets)
-        self.conn = _conn
 
         sign_packet = packet(tag=2, blob=signature)
         return subkey_packet + sign_packet
diff --git a/trezor_agent/gpg/test.sh b/trezor_agent/gpg/test.sh
index 6a31a35..e063cde 100644
--- a/trezor_agent/gpg/test.sh
+++ b/trezor_agent/gpg/test.sh
@@ -1,6 +1,6 @@
 # NEVER RUN ON YOUR OWN REAL GPG KEYS!!!!! THEY WILL BE DELETED!!!!!
 set -x -e -u
-(cd ~/.gnupg && rm -rf openpgp-revocs.d/ private-keys-v1.d/ pubring.kbx* trustdb.gpg /tmp/log *.gpg; killall gpg-agent)
+(cd ~/.gnupg && rm -rf openpgp-revocs.d/ private-keys-v1.d/ pubring.kbx* trustdb.gpg /tmp/log *.gpg; killall gpg-agent || true)
 gpg2 --full-gen-key --expert
 gpg2 --export > romanz.pub
 NOW=`date +%s`