diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt
index b2d9714b..2ed50ffa 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/KeySpecBuilder.kt
@@ -19,7 +19,8 @@ constructor(
 ) : KeySpecBuilderInterface {
 
     private val hashedSubpackets: SelfSignatureSubpackets = SignatureSubpackets()
-    private val algorithmSuite: AlgorithmSuite = PGPainless.getInstance().algorithmPolicy.keyGenerationAlgorithmSuite
+    private val algorithmSuite: AlgorithmSuite =
+        PGPainless.getInstance().algorithmPolicy.keyGenerationAlgorithmSuite
     private var preferredCompressionAlgorithms: Set<CompressionAlgorithm>? =
         algorithmSuite.compressionAlgorithms
     private var preferredHashAlgorithms: Set<HashAlgorithm>? = algorithmSuite.hashAlgorithms
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt
index e58a677f..5d5f60b8 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/signature/consumer/CertificateValidator.kt
@@ -51,7 +51,7 @@ class CertificateValidator {
         fun validateCertificate(
             signature: PGPSignature,
             signingKeyRing: PGPPublicKeyRing,
-            policy: Policy = PGPainless.getPolicy()
+            policy: Policy = PGPainless.getInstance().algorithmPolicy
         ): Boolean {
             val signingSubkey: PGPPublicKey =
                 signingKeyRing.getPublicKey(signature.issuerKeyId)