diff --git a/arch/x86/mm/page.c b/arch/x86/mm/page.c
index db9aca11..1d64bbba 100644
--- a/arch/x86/mm/page.c
+++ b/arch/x86/mm/page.c
@@ -87,6 +87,12 @@ inline static size_t copy_page_table(task_t* task, uint32_t pgd_index, page_tabl
 
 	for(i=0; i<1024; i++) {
 		if (pgt->entries[i] & 0xFFFFF000) {
+			if (!(pgt->entries[i] & PG_USER)) {
+				// Kernel page => copy only page entries
+				new_pgt->entries[i] = pgt->entries[i];
+				continue;
+			}
+
 			phyaddr = get_page();
 			if (!phyaddr)
 				continue;
@@ -140,9 +146,10 @@ int create_pgd(task_t* task, int copy)
 
 	spinlock_lock(&kslock);
 
-	for(i=0; i<KERNEL_SPACE/(1024*PAGE_SIZE); i++) {
+	for(i=0; i<1024; i++) {
 		pgd->entries[i] = boot_pgd.entries[i];
-		if (pgd->entries[i])
+		// only kernel entries will be copied
+		if (pgd->entries[i] && !(pgd->entries[i] & PG_USER))
 			pgt->entries[i] = pgt_container->entries[i];
 	}
 
@@ -165,6 +172,8 @@ int create_pgd(task_t* task, int copy)
 		for (i=KERNEL_SPACE/(1024*PAGE_SIZE); i<1024; i++) {
 			if (!(curr_task->pgd->entries[i]))
 				continue;
+			if (!(curr_task->pgd->entries[i] & PG_USER))
+				continue;
 
 			phyaddr = copy_page_table(task, i, (page_table_t*) ((KERNEL_SPACE - 1024*PAGE_SIZE + i*PAGE_SIZE) & 0xFFFFF000), &counter);
 			if (phyaddr) {
@@ -194,8 +203,8 @@ int drop_pgd(void)
 
 	spinlock_lock(&task->pgd_lock);
 	
-	for(i=KERNEL_SPACE/(1024*PAGE_SIZE); i<1024; i++) {
-		if (pgd->entries[i] & 0xFFFFF000) {
+	for(i=0; i<1024; i++) {
+		if (pgd->entries[i] & PG_USER) {
 			put_page(pgd->entries[i] & 0xFFFFF000);
 			pgd->entries[i] = 0;
 		}