diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index 918813cc16..664c9eb10a 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -1444,8 +1444,8 @@ endg
 	dec	ebx				 ; KEYBOARD
 	jnz  nsyse2
 	mov  edi,[TASK_BASE]
-	add  edi,[edi+TASKDATA.mem_start]
-	mov  eax,edi
+	mov  eax,[edi+TASKDATA.mem_start]
+	add  eax,edx
 
 	dec	ecx
 	jnz  kbnobase
@@ -1638,8 +1638,8 @@ ngsyse1:
      	jnz  ngsyse2
 
      	mov  edi,[TASK_BASE]
-     	add  edi,[edi+TASKDATA.mem_start]
-     	mov  ebx,edi
+     	mov  ebx,[edi+TASKDATA.mem_start]
+     	add  ebx,edx
 
 ;     cmp  ebx,1
 	dec	ecx
@@ -1662,8 +1662,6 @@ kbnoshiftret:
 	dec	ecx
      	jne  kbnoaltret
 
-
-
      	mov  eax,keymap_alt
      	mov  ecx,128
      	call memmove