diff --git a/crypto-lib/libs/libcdoc.jar b/crypto-lib/libs/libcdoc.jar
index 8eb95dfe..9ae96e50 100644
Binary files a/crypto-lib/libs/libcdoc.jar and b/crypto-lib/libs/libcdoc.jar differ
diff --git a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so
index 0a3cc1a6..3de83d56 100644
Binary files a/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/arm64-v8a/libcdoc_java.so differ
diff --git a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so
index 14550f85..1be2437f 100644
Binary files a/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/armeabi-v7a/libcdoc_java.so differ
diff --git a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so
index 8c538a2b..427be551 100644
Binary files a/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/debug/jniLibs/x86_64/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so
index 0a3cc1a6..3de83d56 100644
Binary files a/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/arm64-v8a/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so
index 14550f85..1be2437f 100644
Binary files a/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/armeabi-v7a/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so
index 8c538a2b..427be551 100644
Binary files a/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so and b/crypto-lib/src/main/jniLibs/x86_64/libcdoc_java.so differ
diff --git a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
index b8d1c9d7..f824b3b8 100644
--- a/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
+++ b/crypto-lib/src/main/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainer.kt
@@ -348,30 +348,30 @@ class CryptoContainer
                     }
 
                 val cdocWriter = CDocWriter.createWriter(version, file?.path, conf, null, network)
-                withContext(IO) {
-                    if (version == 2 && cdoc2Settings.getUseOnlineEncryption()) {
-                        val serverId = cdoc2Settings.getCDOC2UUID()
-                        recipients.forEach { addressee ->
-                            val recipient = Recipient.makeEIDServer(addressee?.data, serverId)
-                            if (cdocWriter.addRecipient(recipient) != 0L) {
-                                throw CryptoException("Failed to add recipient")
-                            }
-                        }
-                    } else {
-                        recipients.forEach { addressee ->
-                            val recipient = Recipient.makeEID(addressee?.data)
-                            if (cdocWriter.addRecipient(recipient) != 0L) {
-                                throw CryptoException("Failed to add recipient")
-                            }
-                        }
-                    }
-                }
-
                 try {
                     if (cdocWriter.beginEncryption() != 0L) {
                         throw CryptoException("Failed to begin encryption")
                     }
 
+                    withContext(IO) {
+                        if (version == 2 && cdoc2Settings.getUseOnlineEncryption()) {
+                            val serverId = cdoc2Settings.getCDOC2UUID()
+                            recipients.forEach { addressee ->
+                                val recipient = Recipient.makeEIDServer(addressee?.data, serverId)
+                                if (cdocWriter.addRecipient(recipient) != 0L) {
+                                    throw CryptoException("Failed to add recipient")
+                                }
+                            }
+                        } else {
+                            recipients.forEach { addressee ->
+                                val recipient = Recipient.makeEID(addressee?.data)
+                                if (cdocWriter.addRecipient(recipient) != 0L) {
+                                    throw CryptoException("Failed to add recipient")
+                                }
+                            }
+                        }
+                    }
+
                     withContext(IO) {
                         dataFiles.forEach { dataFile ->
                             val ifs: InputStream = FileInputStream(dataFile)