diff --git a/core/crypto/groestl/groestl.odin b/core/crypto/groestl/groestl.odin
index 8c6d73be8..d3e23dc28 100644
--- a/core/crypto/groestl/groestl.odin
+++ b/core/crypto/groestl/groestl.odin
@@ -68,14 +68,14 @@ use_odin :: #force_inline proc() {
 @(private)
 _create_groestl_ctx :: #force_inline proc(size: _ctx.Hash_Size) {
     ctx: Groestl_Context
-    _hash_impl.internal_ctx = ctx
-    _hash_impl.hash_size    = size
     #partial switch size {
         case ._28: ctx.hashbitlen = 224
         case ._32: ctx.hashbitlen = 256
         case ._48: ctx.hashbitlen = 384
         case ._64: ctx.hashbitlen = 512
     }
+    _hash_impl.internal_ctx = ctx
+    _hash_impl.hash_size    = size
 }
 
 /*
diff --git a/core/crypto/haval/haval.odin b/core/crypto/haval/haval.odin
index 9c52ae1e4..bea799c71 100644
--- a/core/crypto/haval/haval.odin
+++ b/core/crypto/haval/haval.odin
@@ -73,9 +73,6 @@ use_odin :: #force_inline proc() {
 @(private)
 _create_haval_ctx :: #force_inline proc(size: _ctx.Hash_Size, rounds: u32) {
     ctx: Haval_Context
-    ctx.rounds              = rounds
-    _hash_impl.internal_ctx = ctx
-    _hash_impl.hash_size    = size
     #partial switch size {
         case ._16: ctx.hashbitlen = 128
         case ._20: ctx.hashbitlen = 160
@@ -83,6 +80,9 @@ _create_haval_ctx :: #force_inline proc(size: _ctx.Hash_Size, rounds: u32) {
         case ._28: ctx.hashbitlen = 224
         case ._32: ctx.hashbitlen = 256
     }
+    ctx.rounds              = rounds
+    _hash_impl.internal_ctx = ctx
+    _hash_impl.hash_size    = size
 }
 
 /*
diff --git a/core/crypto/jh/jh.odin b/core/crypto/jh/jh.odin
index 3ff409962..3c48f6666 100644
--- a/core/crypto/jh/jh.odin
+++ b/core/crypto/jh/jh.odin
@@ -68,14 +68,14 @@ use_odin :: #force_inline proc() {
 @(private)
 _create_jh_ctx :: #force_inline proc(size: _ctx.Hash_Size) {
     ctx: Jh_Context
-    _hash_impl.internal_ctx = ctx
-    _hash_impl.hash_size    = size
     #partial switch size {
         case ._28: ctx.hashbitlen = 224
         case ._32: ctx.hashbitlen = 256
         case ._48: ctx.hashbitlen = 384
         case ._64: ctx.hashbitlen = 512
     }
+    _hash_impl.internal_ctx = ctx
+    _hash_impl.hash_size    = size
 }
 
 /*