diff --git a/params.c b/params.c
index 5191e4a..0a721a8 100644
--- a/params.c
+++ b/params.c
@@ -238,11 +238,12 @@ int xmss_parse_oid(xmss_params *params, const uint32_t oid)
     params->sig_bytes = (params->index_bytes + params->n
                          + params->d * params->wots_sig_bytes
                          + params->full_height * params->n);
-    params->pk_bytes = 2 * params->n;
-    params->sk_bytes = xmss_core_sk_bytes(params);
 
     // TODO figure out sensible and legal values for this based on the above
     params->bds_k = 0;
+
+    params->pk_bytes = 2 * params->n;
+    params->sk_bytes = xmss_core_sk_bytes(params);
     return 0;
 }
 
@@ -456,10 +457,11 @@ int xmssmt_parse_oid(xmss_params *params, const uint32_t oid)
     params->sig_bytes = (params->index_bytes + params->n
                          + params->d * params->wots_sig_bytes
                          + params->full_height * params->n);
-    params->pk_bytes = 2 * params->n;
-    params->sk_bytes = xmssmt_core_sk_bytes(params);
 
     // TODO figure out sensible and legal values for this based on the above
     params->bds_k = 0;
+
+    params->pk_bytes = 2 * params->n;
+    params->sk_bytes = xmssmt_core_sk_bytes(params);
     return 0;
 }