diff --git a/crypto.hpp b/crypto.hpp
index 62b4237..994862d 100644
--- a/crypto.hpp
+++ b/crypto.hpp
@@ -70,9 +70,9 @@ namespace SimpleWeb {
 
         b64 = BIO_new(BIO_f_base64());
         BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
-// TODO: Remove in 2020
-#if(defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER <= 0x1000115fL) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2080000fL)
-        bio = BIO_new_mem_buf((char *)&base64[0], static_cast<int>(base64.size()));
+// TODO: Remove in 2022 or later
+#if(defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1000214fL) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2080000fL)
+        bio = BIO_new_mem_buf(const_cast<char *>(&base64[0]), static_cast<int>(base64.size()));
 #else
         bio = BIO_new_mem_buf(&base64[0], static_cast<int>(base64.size()));
 #endif