diff --git a/evm/src/cpu/kernel/asm/hash/ripemd/update.asm b/evm/src/cpu/kernel/asm/hash/ripemd/update.asm
index 63d3cff8..c5783cc7 100644
--- a/evm/src/cpu/kernel/asm/hash/ripemd/update.asm
+++ b/evm/src/cpu/kernel/asm/hash/ripemd/update.asm
@@ -117,7 +117,7 @@ buffer_update:
     DUP2
     DUP2
     // stack: get, set, get  , set  , times  , retdest
-    %mupdate_kernel_general
+    %mupdate_current_general
     // stack:           get  , set  , times  , retdest
     %increment
     SWAP1 
diff --git a/evm/src/cpu/kernel/asm/memory/core.asm b/evm/src/cpu/kernel/asm/memory/core.asm
index bdaac62e..41d4927b 100644
--- a/evm/src/cpu/kernel/asm/memory/core.asm
+++ b/evm/src/cpu/kernel/asm/memory/core.asm
@@ -194,6 +194,16 @@
     // stack: (empty)
 %endmacro
 
+// set offset i to offset j in kernel general
+%macro mupdate_current_general
+    // stack: j, i
+    %mload_current_general
+    // stack: x, i
+    SWAP1
+    %mstore_current_general
+    // stack: (empty)
+%endmacro
+
 // Load a single value from the given segment of kernel (context 0) memory.
 %macro mload_kernel(segment)
     // stack: offset
@@ -409,16 +419,6 @@
     %mstore_kernel_u32(@SEGMENT_KERNEL_GENERAL)
 %endmacro
 
-// set offset i to offset j in kernel general
-%macro mupdate_kernel_general
-    // stack: j, i
-    %mload_kernel_general
-    // stack: x, i
-    SWAP1
-    %mstore_kernel_general
-    // stack: (empty)
-%endmacro
-
 // Load a single value from kernel general 2 memory.
 %macro mload_kernel_general_2
     // stack: offset