diff --git a/library/x509.c b/library/x509.c
index 18e6a18de9..446bf249a8 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -861,7 +861,8 @@ int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
             ret = mbedtls_snprintf(p, n, "%s=", short_name);
         } else {
             if ((ret = mbedtls_oid_get_numeric_string(p, n, &name->oid)) > 0) {
-                MBEDTLS_X509_SAFE_SNPRINTF;
+                n -= ret;
+                p += ret;
                 ret = mbedtls_snprintf(p, n, "=");
                 print_hexstring = 1;
             } else {