diff --git a/kernel/trunk/core/taskman.inc b/kernel/trunk/core/taskman.inc
index c22ceb5b37..2b7b5b1105 100644
--- a/kernel/trunk/core/taskman.inc
+++ b/kernel/trunk/core/taskman.inc
@@ -971,8 +971,9 @@ proc set_app_params stdcall,slot:dword, params:dword, flags:dword
         mov     [ebx+SLOT_BASE+APPDATA.cur_dir], eax
         rep movsd
 
-        shr     ebx, 3
-        mov     dword [TASK_TABLE+ebx+TASKDATA.mem_start], 0
+        ;shr     ebx, 3
+        ;mov     dword [TASK_TABLE+ebx+TASKDATA.mem_start], 0
+        mov     dword [ebx+SLOT_BASE+APPDATA.mem_start], 0
 
         mov     ebx, [slot]
         mov     eax, ebx
diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm
index cf7637edb6..fa48e72934 100644
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@@ -1612,8 +1612,10 @@ sys_setup:
         dec     ebx
         jnz     @f
 
-        mov     edi, [TASK_BASE]
-        mov     eax, [edi+TASKDATA.mem_start]
+        ;mov     edi, [TASK_BASE]
+        ;mov     eax, [edi+TASKDATA.mem_start]
+        mov     edi, [current_slot]
+        mov     eax, [edi+APPDATA.mem_start]
         add     eax, edx
 ; 1 = normal layout
         dec     ecx
@@ -1709,8 +1711,10 @@ sys_getsetup:
         dec     ebx
         jnz     @f
 
-        mov     edi, [TASK_BASE]
-        mov     ebx, [edi+TASKDATA.mem_start]
+        ;mov     edi, [TASK_BASE]
+        ;mov     ebx, [edi+TASKDATA.mem_start]
+        mov     edi, [current_slot]
+        mov     ebx, [edi+APPDATA.mem_start]
         add     ebx, edx
 ; 1 = normal layout
         dec     ecx