diff --git a/arch/x86/kernel/gdt.c b/arch/x86/kernel/gdt.c
index 084f071c..b4fd61ae 100644
--- a/arch/x86/kernel/gdt.c
+++ b/arch/x86/kernel/gdt.c
@@ -69,6 +69,8 @@ int arch_fork(task_t* task)
 	memcpy(kstacks[id], kstacks[curr_task->id], KERNEL_STACK_SIZE);
 	task_state_segments[id].cr3 = (uint32_t) (virt_to_phys((size_t)task->pgd));
 	task_state_segments[id].eflags = read_eflags();
+	// the parent task will enable the IF flag
+	task_state_segments[id].eflags |= (1 << 9);
 	task_state_segments[id].esp0 = (uint32_t) kstacks[id] + KERNEL_STACK_SIZE - sizeof(size_t);
 
 	asm volatile("mov %%esp, %0" : "=r"(task_state_segments[id].esp));
@@ -76,18 +78,18 @@ int arch_fork(task_t* task)
 	task_state_segments[id].esp += (uint32_t) kstacks[id];
 
 	asm volatile ("pusha");
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].edi));
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].esi));
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].ebp));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].edi));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].esi));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].ebp));
 #ifdef WITH_FRAME_POINTER
 	task_state_segments[id].ebp -= (uint32_t) kstacks[curr_task->id];
 	task_state_segments[id].ebp += (uint32_t) kstacks[id];
 #endif
 	asm volatile ("add $4, %%esp" ::: "%esp");
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].ebx));
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].edx));
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].ecx));
-	asm volatile ("pop %%eax" : "=a"(task_state_segments[id].eax));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].ebx));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].edx));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].ecx));
+	asm volatile ("pop %0" : "=r"(task_state_segments[id].eax));
 
 	// This will be the entry point for the new task.
 	task_state_segments[id].eip = read_eip();