diff --git a/examples/client/client.c b/examples/client/client.c
index db4eef7d6..fa84beb0d 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -484,7 +484,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 
 #ifndef WOLFSSL_VXWORKS
     while ((ch = mygetopt(argc, argv,
-               "?gdeDusmNrwRitfxXUPCVh:p:v:l:A:c:k:Z:b:zS:L:ToO:aB:W:")) != -1) {
+            "?gdeDusmNrwRitfxXUPCVh:p:v:l:A:c:k:Z:b:zS:F:L:ToO:aB:W:")) != -1) {
         switch (ch) {
             case '?' :
                 Usage();
diff --git a/src/internal.c b/src/internal.c
index d2fc96ef6..41708b9f7 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -8358,7 +8358,7 @@ static int BuildCertificateStatus(WOLFSSL* ssl, byte type, buffer* status,
             idx += status[i].length;
         }
 
-        if (ssl->keys.encryptionOn) {
+        if (IsEncryptionOn(ssl, 1)) {
             byte* input;
             int   inputSz = idx - RECORD_HEADER_SZ;
 
@@ -8367,7 +8367,8 @@ static int BuildCertificateStatus(WOLFSSL* ssl, byte type, buffer* status,
                 return MEMORY_E;
 
             XMEMCPY(input, output + RECORD_HEADER_SZ, inputSz);
-            sendSz = BuildMessage(ssl, output, sendSz, input,inputSz,handshake);
+            sendSz = BuildMessage(ssl, output, sendSz, input, inputSz,
+                                                                  handshake, 1);
             XFREE(input, ssl->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
             if (sendSz < 0)