diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt
index 5e23974b..c8d61971 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeyRingBuilder.kt
@@ -118,17 +118,15 @@ class KeyRingBuilder(
                     signer,
                     secretKeyEncryptor)
             } else {
-                userIds.keys.first().let { primaryUserId ->
-                    PGPKeyRingGenerator(
-                        SignatureType.POSITIVE_CERTIFICATION.code,
-                        certKey,
-                        primaryUserId,
-                        keyFingerprintCalculator,
-                        hashedSubPackets,
-                        null,
-                        signer,
-                        secretKeyEncryptor)
-                }
+                PGPKeyRingGenerator(
+                    SignatureType.POSITIVE_CERTIFICATION.code,
+                    certKey,
+                    userIds.keys.first(),
+                    keyFingerprintCalculator,
+                    hashedSubPackets,
+                    null,
+                    signer,
+                    secretKeyEncryptor)
             }
 
         addSubKeys(certKey, ringGenerator)